Merging from 1.5.
Project: http://git-wip-us.apache.org/repos/asf/ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/5fb3bf69 Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/5fb3bf69 Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/5fb3bf69 Branch: refs/heads/ignite-1843 Commit: 5fb3bf69b8a963d8a5e12ba9d5425b944f0867ff Parents: 59d82af Author: sboikov <[email protected]> Authored: Tue Nov 10 11:38:54 2015 +0300 Committer: sboikov <[email protected]> Committed: Tue Nov 10 11:38:54 2015 +0300 ---------------------------------------------------------------------- .../cache/distributed/dht/preloader/GridDhtPreloader.java | 10 ---------- 1 file changed, 10 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ignite/blob/5fb3bf69/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/preloader/GridDhtPreloader.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/preloader/GridDhtPreloader.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/preloader/GridDhtPreloader.java index d3a58d6..8e56c2d 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/preloader/GridDhtPreloader.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/preloader/GridDhtPreloader.java @@ -245,8 +245,6 @@ public class GridDhtPreloader extends GridCachePreloaderAdapter { if (log.isDebugEnabled()) log.debug("DHT rebalancer onKernalStop callback."); - stopping = true; - cctx.events().removeListener(discoLsnr); // Acquire write busy lock. @@ -258,11 +256,6 @@ public class GridDhtPreloader extends GridCachePreloaderAdapter { if (demander != null) demander.stop(); - IgniteCheckedException err = stopError(); - - for (GridDhtForceKeysFuture fut : forceKeyFuts.values()) - fut.onDone(err); - top = null; } @@ -766,9 +759,6 @@ public class GridDhtPreloader extends GridCachePreloaderAdapter { */ void addFuture(GridDhtForceKeysFuture<?, ?> fut) { forceKeyFuts.put(fut.futureId(), fut); - - if (stopping) - fut.onDone(stopError()); } /**
