ignite-5852 : Fixed affinity calculation for local cache.

apache · Oct 18, 2017 · 6efac46 · 6efac46
1 parent 15efc43
commit 6efac46
Showing 1 changed file with 10 additions and 5 deletions.
diff --git a/...main/java/org/apache/ignite/internal/processors/affinity/GridAffinityAssignmentCache.java b/...main/java/org/apache/ignite/internal/processors/affinity/GridAffinityAssignmentCache.java
@@ -267,8 +267,8 @@ public void onReconnected() {
      * @return Affinity assignments.
      */
     @SuppressWarnings("IfMayBeConditional")
-    public List<List<ClusterNode>> calculate(AffinityTopologyVersion topVer, DiscoveryEvent discoEvt,
-        DiscoCache discoCache) {
+    public List<List<ClusterNode>> calculate(AffinityTopologyVersion topVer, @Nullable DiscoveryEvent discoEvt,
+        @Nullable DiscoCache discoCache) {
         if (log.isDebugEnabled())
             log.debug("Calculating affinity [topVer=" + topVer + ", locNodeId=" + ctx.localNodeId() +
                 ", discoEvt=" + discoEvt + ']');
@@ -286,9 +286,14 @@ public List<List<ClusterNode>> calculate(AffinityTopologyVersion topVer, Discove
         else
             sorted = Collections.singletonList(ctx.discovery().localNode());
 
-        boolean hasBaseline = discoCache.state().baselineTopology() != null;
-        boolean changedBaseline = !hasBaseline ? baselineTopology != null :
-            !discoCache.state().baselineTopology().equals(baselineTopology);
+        boolean hasBaseline = false;
+        boolean changedBaseline = false;
+
+        if (discoCache != null) {
+            hasBaseline = discoCache.state().baselineTopology() != null;
+            changedBaseline = !hasBaseline ? baselineTopology != null :
+                !discoCache.state().baselineTopology().equals(baselineTopology);
+        }
 
         List<List<ClusterNode>> assignment;