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/10/06 14:54:22 UTC
[2/2] ignite git commit: 1093
1093
Project: http://git-wip-us.apache.org/repos/asf/ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/b53a525d
Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/b53a525d
Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/b53a525d
Branch: refs/heads/ignite-1093-2
Commit: b53a525d3edaaa557c51df3939e61a71e9a767d2
Parents: 4d5201c
Author: Anton Vinogradov <av...@apache.org>
Authored: Tue Oct 6 15:54:07 2015 +0300
Committer: Anton Vinogradov <av...@apache.org>
Committed: Tue Oct 6 15:54:07 2015 +0300
----------------------------------------------------------------------
.../cache/distributed/dht/preloader/GridDhtPartitionSupplier.java | 3 ++-
.../distributed/rebalancing/GridCacheRebalancingSyncSelfTest.java | 2 +-
2 files changed, 3 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ignite/blob/b53a525d/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/preloader/GridDhtPartitionSupplier.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/preloader/GridDhtPartitionSupplier.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/preloader/GridDhtPartitionSupplier.java
index 98946f4..cd4b111 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/preloader/GridDhtPartitionSupplier.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/preloader/GridDhtPartitionSupplier.java
@@ -126,7 +126,8 @@ class GridDhtPartitionSupplier {
*
*/
void stop() {
- cctx.events().removeListener(lsnr);
+ if (lsnr != null)
+ cctx.events().removeListener(lsnr);
stopOldListeners();
}
http://git-wip-us.apache.org/repos/asf/ignite/blob/b53a525d/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/rebalancing/GridCacheRebalancingSyncSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/rebalancing/GridCacheRebalancingSyncSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/rebalancing/GridCacheRebalancingSyncSelfTest.java
index 79966e2..b3cf0cb 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/rebalancing/GridCacheRebalancingSyncSelfTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/rebalancing/GridCacheRebalancingSyncSelfTest.java
@@ -254,7 +254,7 @@ public class GridCacheRebalancingSyncSelfTest extends GridCommonAbstractTest {
}
}
- private void test() throws Exception {
+ public void _test() throws Exception {
while (true) {
testComplexRebalancing();