From 7aba97e0ecaa631c3951a45c43af91a08a89097a Mon Sep 17 00:00:00 2001
From: Pavel Kovalenko <jokserfn@gmail.com>
Date: Tue, 6 Mar 2018 19:06:04 +0300
Subject: [PATCH] IGNITE-6113 Return back old implementation instead of
 'removeIf'

---
 .../cache/distributed/dht/GridDhtLocalPartition.java       | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtLocalPartition.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtLocalPartition.java
index 119ea910b1ab0..7a47f31c99055 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtLocalPartition.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtLocalPartition.java
@@ -1194,7 +1194,12 @@ private void clearDeferredDeletes() {
     void onCacheStopped(int cacheId) {
         assert grp.sharedGroup() : grp.cacheOrGroupName();
 
-        rmvQueue.removeIf(e -> e.cacheId() == cacheId);
+        for (Iterator<RemovedEntryHolder> it = rmvQueue.iterator(); it.hasNext();) {
+            RemovedEntryHolder e = it.next();
+
+            if (e.cacheId() == cacheId)
+                it.remove();
+        }
 
         cacheMaps.remove(cacheId);
     }