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/71a0ff23 Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/71a0ff23 Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/71a0ff23 Branch: refs/heads/ignite-7505 Commit: 71a0ff238cef1a9594cc3a55eecd5acf35ccd89d Parents: 3f346af Author: Alexey Goncharuk <[email protected]> Authored: Tue Jan 23 12:02:45 2018 +0300 Committer: Alexey Goncharuk <[email protected]> Committed: Tue Jan 23 12:02:45 2018 +0300 ---------------------------------------------------------------------- .../processors/affinity/GridAffinityAssignmentCache.java | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ignite/blob/71a0ff23/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 47f5612..ca3ca35 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 @@ -42,6 +42,7 @@ import org.apache.ignite.internal.GridKernalContext; import org.apache.ignite.internal.cluster.NodeOrderComparator; import org.apache.ignite.internal.IgniteInternalFuture; import org.apache.ignite.internal.managers.discovery.DiscoCache; +import org.apache.ignite.internal.processors.cache.CacheGroupContext; import org.apache.ignite.internal.processors.cluster.BaselineTopology; import org.apache.ignite.internal.util.future.GridFutureAdapter; import org.apache.ignite.internal.util.typedef.F; @@ -196,7 +197,9 @@ public class GridAffinityAssignmentCache { DiscoCache discoCache = ctx.discovery().discoCache(topVer); - if (ctx.cache().cacheGroup(grpId).persistenceEnabled()) { + CacheGroupContext grpCtx = ctx.cache().cacheGroup(grpId); + + if (grpCtx.persistenceEnabled() && !grpCtx.isLocal()) { for (List<ClusterNode> pNodes : affAssignment) { for (ClusterNode pNode : pNodes) assert discoCache.baselineNode(pNode.id());
