ignite-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From akuznet...@apache.org
Subject [1/5] ignite git commit: ignite-1.6 Update ready topology version before complete cache start future
Date Fri, 13 May 2016 09:59:00 GMT
Repository: ignite
Updated Branches:
  refs/heads/master 06ba3fe2a -> cc9d6a58c


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/master
Commit: 2ac4aa6039f51626529ccc6f606e683b48854406
Parents: 5682d8e
Author: sboikov <sboikov@gridgain.com>
Authored: Fri May 13 10:44:40 2016 +0300
Committer: sboikov <sboikov@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 +


Mime
View raw message