[infinispan-commits] Infinispan SVN: r1453 - trunk/core/src/main/java/org/infinispan/util/concurrent.

[infinispan-commits at lists.jboss.org]

Author: vblagojevic at jboss.com
Date: 2010-02-04 10:40:05 -0500 (Thu, 04 Feb 2010)
New Revision: 1453

Modified:
   trunk/core/src/main/java/org/infinispan/util/concurrent/BufferedConcurrentHashMap.java
Log:
ns

Modified: trunk/core/src/main/java/org/infinispan/util/concurrent/BufferedConcurrentHashMap.java
===================================================================
--- trunk/core/src/main/java/org/infinispan/util/concurrent/BufferedConcurrentHashMap.java	2010-02-04 15:22:46 UTC (rev 1452)
+++ trunk/core/src/main/java/org/infinispan/util/concurrent/BufferedConcurrentHashMap.java	2010-02-04 15:40:05 UTC (rev 1453)
@@ -801,6 +801,9 @@
             @Override
             public Set<HashEntry<K, V>> execute() {
                 Set<HashEntry<K, V>> evicted = Collections.emptySet();
+                if (isOverflow()) {
+                    evicted = new HashSet<HashEntry<K, V>>();
+                }
                 try {
                     for (HashEntry<K, V> e : accessQueue) {
                         if (lruQueue.remove(e)) {
@@ -810,9 +813,6 @@
                     while (isOverflow()) {
                         HashEntry<K, V> first = lruQueue.getLast();
                         remove(first.key, first.hash, null);
-                        if (evicted.isEmpty()) {
-                            evicted = new HashSet<HashEntry<K, V>>();
-                        }
                         evicted.add(first);
                     }
                 } finally {