ignite-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From sboi...@apache.org
Subject [6/6] ignite git commit: 5578
Date Sun, 30 Jul 2017 15:26:57 GMT
5578


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

Branch: refs/heads/ignite-5578
Commit: ba764f099f6015931fa7779cc05930b0c8753db0
Parents: 8481fa8
Author: sboikov <sboikov@gridgain.com>
Authored: Sun Jul 30 18:26:35 2017 +0300
Committer: sboikov <sboikov@gridgain.com>
Committed: Sun Jul 30 18:26:35 2017 +0300

----------------------------------------------------------------------
 .../dht/preloader/GridDhtPartitionsExchangeFuture.java          | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/ignite/blob/ba764f09/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 420b9c2..f474ad1 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
@@ -1770,6 +1770,9 @@ public class GridDhtPartitionsExchangeFuture extends GridDhtTopologyFutureAdapte
 
         listen(new CI1<IgniteInternalFuture<AffinityTopologyVersion>>() {
             @Override public void apply(IgniteInternalFuture<AffinityTopologyVersion>
fut) {
+                if (cctx.kernalContext().isStopping())
+                    return;
+
                 FinishState finishState0;
 
                 synchronized (GridDhtPartitionsExchangeFuture.this) {
@@ -1777,7 +1780,7 @@ public class GridDhtPartitionsExchangeFuture extends GridDhtTopologyFutureAdapte
                 }
 
                 if (finishState0 == null) {
-                    assert discoEvt.type() == EVT_NODE_JOINED && CU.clientNode(discoEvt.eventNode())
: discoEvt;
+                    assert discoEvt.type() == EVT_NODE_JOINED && CU.clientNode(discoEvt.eventNode())
: this;
 
                     finishState0 = new FinishState(cctx.localNodeId(),
                         initialVersion(),


Mime
View raw message