diff -urp --binary infinispan-5.1.8.Final\core/src/main/java/org/infinispan/util/concurrent/BoundedConcurrentHashMap.java infinispan-5.1.8.Final-IBM-PATCHED\core/src/main/java/org/infinispan/util/concurrent/BoundedConcurrentHashMap.java
--- infinispan-5.1.8.Final\core/src/main/java/org/infinispan/util/concurrent/BoundedConcurrentHashMap.java	2012-10-17 13:31:40.000000000 +0200
+++ infinispan-5.1.8.Final-IBM-PATCHED\core/src/main/java/org/infinispan/util/concurrent/BoundedConcurrentHashMap.java	2013-03-20 10:02:23.893000000 +0100
@@ -518,8 +518,9 @@ public class BoundedConcurrentHashMap<K,
             segment.evictionListener.onEntryChosenForEviction(evictedEntry.value);
             segment.remove(evictedEntry.key, evictedEntry.hash, null);
             evicted.add(evictedEntry);
+            remove(evictedEntry);
          }
-         return aboveThreshold;
+         return false;
       }
 
       @Override