ISPN-8548 Clear post notifications can cause memory issues as it holds

all entries locally
infinispan · Nov 21, 2017 · ef05bfd · ef05bfd
1 parent d5ff235
commit ef05bfd
Showing 1 changed file with 7 additions and 4 deletions.
diff --git a/core/src/main/java/org/infinispan/interceptors/locking/ClusteringDependentLogic.java b/core/src/main/java/org/infinispan/interceptors/locking/ClusteringDependentLogic.java
@@ -6,6 +6,7 @@
 import java.util.ArrayList;
 import java.util.Collection;
 import java.util.Collections;
+import java.util.Iterator;
 import java.util.List;
 
 import org.infinispan.commands.FlagAffectedCommand;
@@ -186,10 +187,12 @@ public final void commitEntry(CacheEntry entry, FlagAffectedCommand command, Inv
 
       private void commitClearCommand(DataContainer<Object, Object> dataContainer, ClearCacheEntry<Object, Object> cacheEntry,
                                       InvocationContext context, FlagAffectedCommand command) {
-         List<InternalCacheEntry<Object, Object>> copyEntries = new ArrayList<>(dataContainer.sizeIncludingExpired());
-         dataContainer.iterator().forEachRemaining(copyEntries::add);
-         cacheEntry.commit(dataContainer);
-         for (InternalCacheEntry entry : copyEntries) {
+         Iterator<InternalCacheEntry<Object, Object>> iterator = dataContainer.iterator();
+
+         while (iterator.hasNext()) {
+            InternalCacheEntry entry = iterator.next();
+            // Iterator doesn't support remove
+            dataContainer.remove(entry.getKey());
             notifier.notifyCacheEntryRemoved(entry.getKey(), entry.getValue(), entry.getMetadata(), false, context, command);
          }
       }