ignite-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From sboi...@apache.org
Subject ignite git commit: 5578
Date Mon, 31 Jul 2017 08:01:35 GMT
Repository: ignite
Updated Branches:
  refs/heads/ignite-5578 e308d3289 -> 264f518ea


5578


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

Branch: refs/heads/ignite-5578
Commit: 264f518eae142e87c99a09c8ba0202441e4e17fa
Parents: e308d32
Author: sboikov <sboikov@gridgain.com>
Authored: Mon Jul 31 11:01:30 2017 +0300
Committer: sboikov <sboikov@gridgain.com>
Committed: Mon Jul 31 11:01:30 2017 +0300

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


http://git-wip-us.apache.org/repos/asf/ignite/blob/264f518e/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 d23aba8..495f8b4 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
@@ -1534,8 +1534,8 @@ public class GridDhtPartitionsExchangeFuture extends GridDhtTopologyFutureAdapte
         boolean wait;
 
         synchronized (this) {
-            assert !isDone() && !initFut.isDone() : this;
-            assert mergedWith == null && state == null : this;
+            assert (!isDone() && !initFut.isDone()) || cctx.kernalContext().isStopping()
: this;
+            assert (mergedWith == null && state == null) || cctx.kernalContext().isStopping()
 : this;
 
             state = ExchangeLocalState.MERGED;
 


Mime
View raw message