[ignite] branch master updated: IGNITE-11615 Fixed NPE on node stop in IgniteBaselineAffinityTopologyActivationTest - Fixes #6331.

[ag...@apache.org]

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

agoncharuk 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 9849987  IGNITE-11615 Fixed NPE on node stop in IgniteBaselineAffinityTopologyActivationTest - Fixes #6331.
9849987 is described below

commit 984998763a4d501431c5de00e83dcbae88f728b6
Author: Alexey Goncharuk <al...@gmail.com>
AuthorDate: Mon Mar 25 11:17:32 2019 +0300

    IGNITE-11615 Fixed NPE on node stop in IgniteBaselineAffinityTopologyActivationTest - Fixes #6331.
    
    Signed-off-by: Alexey Goncharuk <al...@gmail.com>
---
 .../apache/ignite/internal/processors/cache/CacheGroupContext.java  | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/CacheGroupContext.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/CacheGroupContext.java
index 4efb2da..9329a6c 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/CacheGroupContext.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/CacheGroupContext.java
@@ -739,7 +739,11 @@ public class CacheGroupContext {
         if (!isRecoveryMode()) {
             aff.cancelFutures(new IgniteCheckedException("Failed to wait for topology update, node is stopping."));
 
-            preldr.onKernalStop();
+            // This may happen if an exception is occurred on node start and we stop a node in the middle of the start
+            // procedure. It is safe to do a null-check here because preldr may be created only in exchange-worker
+            // thread which is stopped by the time this method is invoked.
+            if (preldr != null)
+                preldr.onKernalStop();
         }
 
         offheapMgr.onKernalStop();