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 2015/09/16 18:33:59 UTC
ignite git commit: ignite-1452
Repository: ignite
Updated Branches:
refs/heads/ignite-1452 b0b33f0d2 -> 06f3133d2
ignite-1452
Project: http://git-wip-us.apache.org/repos/asf/ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/06f3133d
Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/06f3133d
Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/06f3133d
Branch: refs/heads/ignite-1452
Commit: 06f3133d29295211bbe6fd2cb0a32f4bdf0a0567
Parents: b0b33f0
Author: sboikov <se...@inria.fr>
Authored: Wed Sep 16 19:18:48 2015 +0300
Committer: sboikov <se...@inria.fr>
Committed: Wed Sep 16 19:18:48 2015 +0300
----------------------------------------------------------------------
.../cache/distributed/dht/preloader/GridDhtForceKeysFuture.java | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ignite/blob/06f3133d/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/preloader/GridDhtForceKeysFuture.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/preloader/GridDhtForceKeysFuture.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/preloader/GridDhtForceKeysFuture.java
index 36a2da1..eaed424 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/preloader/GridDhtForceKeysFuture.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/preloader/GridDhtForceKeysFuture.java
@@ -283,7 +283,7 @@ public final class GridDhtForceKeysFuture<K, V> extends GridCompoundFuture<Objec
// Fail the whole thing.
if (e instanceof ClusterTopologyCheckedException)
fut.onResult((ClusterTopologyCheckedException)e);
- else
+ else if (!cctx.kernalContext().isStopping())
fut.onResult(e);
}
}