# ignite-1.3.3-p3 exchange manager can return null affinityReadyFuture
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/d78e8bcc Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/d78e8bcc Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/d78e8bcc Branch: refs/heads/ignite-1258 Commit: d78e8bcc820268f7244dea021258978d46d4b411 Parents: 2054f19 Author: sboikov <sboi...@gridgain.com> Authored: Thu Aug 20 14:25:11 2015 +0300 Committer: sboikov <sboi...@gridgain.com> Committed: Thu Aug 20 14:25:11 2015 +0300 ---------------------------------------------------------------------- .../ignite/internal/processors/cache/GridCacheSharedContext.java | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/d78e8bcc/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheSharedContext.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheSharedContext.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheSharedContext.java index f7763ec..6562257 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheSharedContext.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheSharedContext.java @@ -455,7 +455,9 @@ public class GridCacheSharedContext<K, V> { AffinityTopologyVersion nextVer = new AffinityTopologyVersion(curVer.topologyVersion() + 1); - return exchMgr.affinityReadyFuture(nextVer); + IgniteInternalFuture<?> fut = exchMgr.affinityReadyFuture(nextVer); + + return fut == null ? new GridFinishedFuture<>() : fut; } /**
