Repository: ignite Updated Branches: refs/heads/ignite-1093-2 b6b6ad5d9 -> 8f7ed743a
1093 Project: http://git-wip-us.apache.org/repos/asf/ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/8f7ed743 Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/8f7ed743 Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/8f7ed743 Branch: refs/heads/ignite-1093-2 Commit: 8f7ed743a1bf3b6be535c4c0b37b1d79b26d8ce0 Parents: b6b6ad5 Author: Anton Vinogradov <[email protected]> Authored: Sat Oct 17 14:05:04 2015 +0300 Committer: Anton Vinogradov <[email protected]> Committed: Sat Oct 17 14:05:04 2015 +0300 ---------------------------------------------------------------------- .../ignite/internal/processors/cache/GridCacheProcessor.java | 4 ---- .../distributed/dht/preloader/GridDhtPartitionDemander.java | 2 -- 2 files changed, 6 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ignite/blob/8f7ed743/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheProcessor.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheProcessor.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheProcessor.java index 9667bed..c2acd99 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheProcessor.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheProcessor.java @@ -19,7 +19,6 @@ package org.apache.ignite.internal.processors.cache; import java.io.Serializable; import java.util.ArrayList; -import java.util.Arrays; import java.util.Collection; import java.util.Collections; import java.util.Comparator; @@ -3213,9 +3212,6 @@ public class GridCacheProcessor extends GridProcessorAdapter { for (Class<?> itf : o.getClass().getInterfaces()) { if (itf.getName().endsWith("MBean") || itf.getName().endsWith("MXBean")) { try { - //TODO: TO BE REMOVED - U.log(log, "Bean registration " + cacheName + " " + Arrays.toString(Thread.currentThread().getStackTrace())); - U.registerCacheMBean(srvr, ctx.gridName(), cacheName, o.getClass().getName(), o, (Class<Object>)itf); } http://git-wip-us.apache.org/repos/asf/ignite/blob/8f7ed743/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 aac1d2c..f2f0bec 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 @@ -145,8 +145,6 @@ public class GridDhtPartitionDemander { * Stop. */ void stop() { - rebalanceFut.cancel(); - lastExchangeFut = null; lastTimeoutObj.set(null);
