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 2017/08/22 08:29:38 UTC
ignite git commit: ignite-6124 Fixed NPE in
GridDhtPartitionsExchangeFuture.topologyVersion after future cleanup.
Repository: ignite
Updated Branches:
refs/heads/master 1f5054a2c -> 2c9057a3e
ignite-6124 Fixed NPE in GridDhtPartitionsExchangeFuture.topologyVersion after future cleanup.
Project: http://git-wip-us.apache.org/repos/asf/ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/2c9057a3
Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/2c9057a3
Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/2c9057a3
Branch: refs/heads/master
Commit: 2c9057a3eb060cb5beb8ae9bc4173d15d99433e4
Parents: 1f5054a
Author: sboikov <sb...@gridgain.com>
Authored: Tue Aug 22 11:29:32 2017 +0300
Committer: sboikov <sb...@gridgain.com>
Committed: Tue Aug 22 11:29:32 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/2c9057a3/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();
}
/**