You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ignite.apache.org by sb...@apache.org on 2016/05/13 07:44:48 UTC
ignite git commit: ignite-1.6 Update ready topology version before
complete cache start future
Repository: ignite
Updated Branches:
refs/heads/ignite-1.6 5682d8ead -> 2ac4aa603
ignite-1.6 Update ready topology version before complete cache start future
Project: http://git-wip-us.apache.org/repos/asf/ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/2ac4aa60
Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/2ac4aa60
Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/2ac4aa60
Branch: refs/heads/ignite-1.6
Commit: 2ac4aa6039f51626529ccc6f606e683b48854406
Parents: 5682d8e
Author: sboikov <sb...@gridgain.com>
Authored: Fri May 13 10:44:40 2016 +0300
Committer: sboikov <sb...@gridgain.com>
Committed: Fri May 13 10:44:40 2016 +0300
----------------------------------------------------------------------
.../dht/preloader/GridDhtPartitionsExchangeFuture.java | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ignite/blob/2ac4aa60/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 82e9bda..eae7c45 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
@@ -1072,10 +1072,10 @@ public class GridDhtPartitionsExchangeFuture extends GridFutureAdapter<AffinityT
cacheValidRes = m != null ? m : Collections.<Integer, Boolean>emptyMap();
}
- cctx.cache().onExchangeDone(exchId.topologyVersion(), reqs, err);
-
cctx.exchange().onExchangeDone(this, err);
+ cctx.cache().onExchangeDone(exchId.topologyVersion(), reqs, err);
+
if (super.onDone(res, err) && realExchange) {
if (log.isDebugEnabled())
log.debug("Completed partition exchange [localNode=" + cctx.localNodeId() + ", exchange= " + this +