commit 8f824ca5822d4d7d0b9eb12aa726c32a56776bbc
author Ilya Kazakov <kazakov.ilya@gmail.com> Fri Oct 23 18:36:47 2020 +0300
committer Ilya Kasnacheev <ilya.kasnacheev@gmail.com> Fri Oct 23 18:36:47 2020 +0300
tree 9cd34a2b035d21e720bb49782b7124bb3be943ef
parent 32cc93f365d7e7317772d7f1a842453c93dc09e2

IGNITE-13398 Avoid NPE when destroying the cache if there is a running service - Fixes #8376.

Signed-off-by: Ilya Kasnacheev <ilya.kasnacheev@gmail.com>

modules/core/src/main/java/org/apache/ignite/internal/processors/service/IgniteServiceProcessor.java

diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/service/IgniteServiceProcessor.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/service/IgniteServiceProcessor.java
index 2e4dcec..c25a87e 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/service/IgniteServiceProcessor.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/service/IgniteServiceProcessor.java
@@ -26,6 +26,7 @@
 import java.util.Iterator;
 import java.util.List;
 import java.util.Map;
+import java.util.Objects;
 import java.util.Random;
 import java.util.Set;
 import java.util.TreeMap;
@@ -1696,7 +1697,7 @@
                 registeredServices.entrySet().removeIf(e -> {
                     ServiceInfo desc = e.getValue();
 
-                    if (desc.cacheName().equals(chReq.cacheName())) {
+                    if (Objects.equals(desc.cacheName(), chReq.cacheName())) {
                         toUndeploy.put(desc.serviceId(), desc);
 
                         return true;