Repository: ignite
Updated Branches:
  refs/heads/ignite-6124 [created] 5cfd08231


ignite-6124


Project: http://git-wip-us.apache.org/repos/asf/ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/5cfd0823
Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/5cfd0823
Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/5cfd0823

Branch: refs/heads/ignite-6124
Commit: 5cfd082313238b6a608cdd60e412f61b0a902e10
Parents: 60c0560
Author: sboikov <sboi...@gridgain.com>
Authored: Mon Aug 21 19:25:40 2017 +0300
Committer: sboikov <sboi...@gridgain.com>
Committed: Mon Aug 21 19:25:40 2017 +0300

----------------------------------------------------------------------
 .../distributed/dht/preloader/GridDhtPartitionsExchangeFuture.java | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/ignite/blob/5cfd0823/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 d64adc5..ceb5abc 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
@@ -365,7 +365,7 @@ public class GridDhtPartitionsExchangeFuture extends 
GridDhtTopologyFutureAdapte
          */
         assert exchangeDone() : "Should not be called before exchange is 
finished";
 
-        return exchCtx.events().topologyVersion();
+        return isDone() ? result() : exchCtx.events().topologyVersion();
     }
 
     /**

Reply via email to