ignite-1093
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/c3d47ced Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/c3d47ced Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/c3d47ced Branch: refs/heads/ignite-1093 Commit: c3d47cedb4f377404a00f01b53e2e52b68a07987 Parents: c1f8432 Author: Anton Vinogradov <vinogradov.an...@gmail.com> Authored: Thu Aug 20 20:19:56 2015 +0300 Committer: Anton Vinogradov <vinogradov.an...@gmail.com> Committed: Thu Aug 20 20:19:56 2015 +0300 ---------------------------------------------------------------------- .../cache/distributed/dht/preloader/GridDhtPartitionDemander.java | 3 ++- .../rebalancing/GridCacheMassiveRebalancingSyncSelfTest.java | 2 +- 2 files changed, 3 insertions(+), 2 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/c3d47ced/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 72d43c9..73e1fed 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 @@ -829,7 +829,8 @@ public class GridDhtPartitionDemander { if (cctx.events().isRecordable(EVT_CACHE_REBALANCE_STOPPED) && !cctx.isReplicated()) preloadEvent(EVT_CACHE_REBALANCE_STOPPED, assigns.exchangeFuture().discoveryEvent()); - cctx.events().removeListener(lsnr); + if (lsnr != null) + cctx.events().removeListener(lsnr); onDone(cancelled); } http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/c3d47ced/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/rebalancing/GridCacheMassiveRebalancingSyncSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/rebalancing/GridCacheMassiveRebalancingSyncSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/rebalancing/GridCacheMassiveRebalancingSyncSelfTest.java index 9606810..cc82e79 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/rebalancing/GridCacheMassiveRebalancingSyncSelfTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/rebalancing/GridCacheMassiveRebalancingSyncSelfTest.java @@ -39,7 +39,7 @@ public class GridCacheMassiveRebalancingSyncSelfTest extends GridCommonAbstractT /** */ protected static TcpDiscoveryIpFinder ipFinder = new TcpDiscoveryVmIpFinder(true); - private static int TEST_SIZE = 10_024_000; + private static int TEST_SIZE = 1_024_000; /** cache name. */ protected static String CACHE_NAME_DHT = "cache";
