GG-13361 Fixed NPE

Project: http://git-wip-us.apache.org/repos/asf/ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/98566e08
Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/98566e08
Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/98566e08

Branch: refs/heads/ignite-7505
Commit: 98566e087bbd632b832321ea584417137a515e42
Parents: 71a0ff2
Author: Alexey Goncharuk <[email protected]>
Authored: Tue Jan 23 12:30:59 2018 +0300
Committer: Alexey Goncharuk <[email protected]>
Committed: Tue Jan 23 12:30:59 2018 +0300

----------------------------------------------------------------------
 .../internal/processors/affinity/GridAffinityAssignmentCache.java  | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/ignite/blob/98566e08/modules/core/src/main/java/org/apache/ignite/internal/processors/affinity/GridAffinityAssignmentCache.java
----------------------------------------------------------------------
diff --git 
a/modules/core/src/main/java/org/apache/ignite/internal/processors/affinity/GridAffinityAssignmentCache.java
 
b/modules/core/src/main/java/org/apache/ignite/internal/processors/affinity/GridAffinityAssignmentCache.java
index ca3ca35..34c6f34 100644
--- 
a/modules/core/src/main/java/org/apache/ignite/internal/processors/affinity/GridAffinityAssignmentCache.java
+++ 
b/modules/core/src/main/java/org/apache/ignite/internal/processors/affinity/GridAffinityAssignmentCache.java
@@ -199,7 +199,7 @@ public class GridAffinityAssignmentCache {
 
         CacheGroupContext grpCtx = ctx.cache().cacheGroup(grpId);
 
-        if (grpCtx.persistenceEnabled() && !grpCtx.isLocal()) {
+        if (grpCtx != null && grpCtx.persistenceEnabled() && 
!grpCtx.isLocal()) {
             for (List<ClusterNode> pNodes : affAssignment) {
                 for (ClusterNode pNode : pNodes)
                     assert discoCache.baselineNode(pNode.id());

Reply via email to