Fix NPE in GridCachePartitionExchangeManager.createPartitionsFullMessage.
@@ -871,6 +871,9 @@ public class GridCachePartitionExchangeManager<K, V> extends GridCacheSharedMana
ready = cacheCtx.started();
if (ready) {
+ GridAffinityAssignmentCache affCache = cacheCtx.affinity().affinityCache();
+
+ if (affCache != null) {
GridDhtPartitionFullMap locMap = cacheCtx.topology().partitionMap(true);
addFullPartitionsMap(m,
@@ -878,11 +881,14 @@ public class GridCachePartitionExchangeManager<K, V> extends GridCacheSharedMana
compress,
cacheCtx.cacheId(),
locMap,
- cacheCtx.affinity().affinityCache().similarAffinityKey());
+ affCache.similarAffinityKey());
if (exchId != null)
m.addPartitionUpdateCounters(cacheCtx.cacheId(), cacheCtx.topology().updateCounters(true));
}
+ else
+ assert cctx.cacheContext(cacheCtx.cacheId()) == null : cacheCtx.name();
+ }
}
}
