Repository: ignite Updated Branches: refs/heads/ignite-5578 b593db7f2 -> d6b2420e1
ignite-5578 Project: http://git-wip-us.apache.org/repos/asf/ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/d6b2420e Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/d6b2420e Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/d6b2420e Branch: refs/heads/ignite-5578 Commit: d6b2420e1671f66e0a2ef38157bf894109ce606d Parents: b593db7 Author: sboikov <[email protected]> Authored: Tue Aug 1 17:20:28 2017 +0300 Committer: sboikov <[email protected]> Committed: Tue Aug 1 17:20:28 2017 +0300 ---------------------------------------------------------------------- .../dht/preloader/GridDhtPartitionsExchangeFuture.java | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ignite/blob/d6b2420e/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/preloader/GridDhtPartitionsExchangeFuture.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/preloader/GridDhtPartitionsExchangeFuture.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/preloader/GridDhtPartitionsExchangeFuture.java index de02238..406b2b9 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/preloader/GridDhtPartitionsExchangeFuture.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/preloader/GridDhtPartitionsExchangeFuture.java @@ -1343,6 +1343,11 @@ public class GridDhtPartitionsExchangeFuture extends GridDhtTopologyFutureAdapte } /** {@inheritDoc} */ + @Override public boolean isDone() { + return done.get(); + } + + /** {@inheritDoc} */ @Override public boolean onDone(@Nullable AffinityTopologyVersion res, @Nullable Throwable err) { if (!done.compareAndSet(false, true)) return false; @@ -1409,6 +1414,8 @@ public class GridDhtPartitionsExchangeFuture extends GridDhtTopologyFutureAdapte cctx.cache().onExchangeDone(initialVersion(), exchActions, err); + cctx.exchange().onExchangeDone(res, initialVersion(), err); + if (exchActions != null && err == null) exchActions.completeRequestFutures(cctx); @@ -1443,8 +1450,6 @@ public class GridDhtPartitionsExchangeFuture extends GridDhtTopologyFutureAdapte log.debug("Completed partition exchange [localNode=" + cctx.localNodeId() + ", exchange= " + this + ", durationFromInit=" + (U.currentTimeMillis() - initTs) + ']'); - cctx.exchange().onExchangeDone(res, initialVersion(), err); - initFut.onDone(err == null); if (exchId.isLeft()) {
