[ignite] branch master updated: IGNITE-13398 Avoid NPE when destroying the cache if there is a running service - Fixes #8376.

[ilyak]

This is an automated email from the ASF dual-hosted git repository.

ilyak pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/ignite.git


The following commit(s) were added to refs/heads/master by this push:
     new 8f824ca  IGNITE-13398 Avoid NPE when destroying the cache if there is 
a running service - Fixes #8376.
8f824ca is described below

commit 8f824ca5822d4d7d0b9eb12aa726c32a56776bbc
Author: Ilya Kazakov <kazakov.i...@gmail.com>
AuthorDate: Fri Oct 23 18:36:47 2020 +0300

    IGNITE-13398 Avoid NPE when destroying the cache if there is a running 
service - Fixes #8376.
    
    Signed-off-by: Ilya Kasnacheev <ilya.kasnach...@gmail.com>
---
 .../ignite/internal/processors/service/IgniteServiceProcessor.java     | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

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.HashSet;
 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 @@ public class IgniteServiceProcessor extends 
ServiceProcessorAdapter implements I
                 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;