Fixed affinityReadyFuture (lastFinishedFuture could be null for compute jobs).
Project: http://git-wip-us.apache.org/repos/asf/ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/62cb4fb5 Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/62cb4fb5 Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/62cb4fb5 Branch: refs/heads/ignite-5937 Commit: 62cb4fb55481b53f780d588d865cbbd1f4d5f45f Parents: 8afeb67 Author: sboikov <[email protected]> Authored: Tue Oct 24 11:19:43 2017 +0300 Committer: sboikov <[email protected]> Committed: Tue Oct 24 11:19:43 2017 +0300 ---------------------------------------------------------------------- .../ignite/internal/processors/cache/GridCacheAffinityManager.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ignite/blob/62cb4fb5/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheAffinityManager.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheAffinityManager.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheAffinityManager.java index fbe1a95..14a1344 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheAffinityManager.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheAffinityManager.java @@ -99,7 +99,7 @@ public class GridCacheAffinityManager extends GridCacheManagerAdapter { IgniteInternalFuture<AffinityTopologyVersion> fut = aff.readyFuture(topVer); - return fut != null ? fut : cctx.shared().exchange().lastFinishedFuture(); + return fut != null ? fut : new GridFinishedFuture<>(aff.lastVersion()); } /**
