Repository: ignite Updated Branches: refs/heads/ignite-1093-3 645f86a7f -> 8333e2535
1093 Project: http://git-wip-us.apache.org/repos/asf/ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/8333e253 Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/8333e253 Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/8333e253 Branch: refs/heads/ignite-1093-3 Commit: 8333e2535f3fb40120068ec4236c58bce9c1d57a Parents: 645f86a Author: Anton Vinogradov <[email protected]> Authored: Tue Nov 3 11:44:08 2015 +0300 Committer: Anton Vinogradov <[email protected]> Committed: Tue Nov 3 11:44:08 2015 +0300 ---------------------------------------------------------------------- .../distributed/dht/preloader/GridDhtPartitionDemander.java | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ignite/blob/8333e253/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/preloader/GridDhtPartitionDemander.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/preloader/GridDhtPartitionDemander.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/preloader/GridDhtPartitionDemander.java index 43248ab..f2c1dc2 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/preloader/GridDhtPartitionDemander.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/preloader/GridDhtPartitionDemander.java @@ -23,7 +23,6 @@ import java.util.Collections; import java.util.HashMap; import java.util.HashSet; import java.util.Iterator; -import java.util.LinkedList; import java.util.List; import java.util.Map; import java.util.Set; @@ -145,7 +144,12 @@ public class GridDhtPartitionDemander { * Stop. */ void stop() { - rebalanceFut.cancel(); + try { + rebalanceFut.cancel(); + } + catch (Exception ex) { + rebalanceFut.onDone(false); + } lastExchangeFut = null;
