Repository: incubator-ignite Updated Branches: refs/heads/ignite-1245 b882354e8 -> 7c51d9460
# minor Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/7c51d946 Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/7c51d946 Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/7c51d946 Branch: refs/heads/ignite-1245 Commit: 7c51d9460a48e4e95c53de1f71b39f66c5ffffe1 Parents: b882354 Author: sboikov <sboi...@gridgain.com> Authored: Thu Aug 13 17:34:15 2015 +0300 Committer: sboikov <sboi...@gridgain.com> Committed: Thu Aug 13 17:35:16 2015 +0300 ---------------------------------------------------------------------- .../continuous/GridContinuousProcessor.java | 20 ++++++++++---------- .../IgniteCacheContinuousQueryClientTest.java | 5 ++++- 2 files changed, 14 insertions(+), 11 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/7c51d946/modules/core/src/main/java/org/apache/ignite/internal/processors/continuous/GridContinuousProcessor.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/continuous/GridContinuousProcessor.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/continuous/GridContinuousProcessor.java index 8c8e259..5f1c4bb 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/continuous/GridContinuousProcessor.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/continuous/GridContinuousProcessor.java @@ -193,10 +193,10 @@ public class GridContinuousProcessor extends GridProcessorAdapter { unregisterRemote(routineId); if (snd.isClient()) { - Map<UUID, LocalRoutineInfo> clientRouteMap = clientInfos.get(snd.id()); + Map<UUID, LocalRoutineInfo> clientRoutineMap = clientInfos.get(snd.id()); - if (clientRouteMap != null) - clientRouteMap.remove(msg.routineId()); + if (clientRoutineMap != null) + clientRoutineMap.remove(msg.routineId()); } } } @@ -372,9 +372,9 @@ public class GridContinuousProcessor extends GridProcessorAdapter { for (Map.Entry<UUID, Map<UUID, LocalRoutineInfo>> entry : data.clientInfos.entrySet()) { UUID clientNodeId = entry.getKey(); - Map<UUID, LocalRoutineInfo> clientRouteMap = entry.getValue(); + Map<UUID, LocalRoutineInfo> clientRoutineMap = entry.getValue(); - for (Map.Entry<UUID, LocalRoutineInfo> e : clientRouteMap.entrySet()) { + for (Map.Entry<UUID, LocalRoutineInfo> e : clientRoutineMap.entrySet()) { UUID routineId = e.getKey(); LocalRoutineInfo info = e.getValue(); @@ -751,17 +751,17 @@ public class GridContinuousProcessor extends GridProcessorAdapter { } if (node.isClient()) { - Map<UUID, LocalRoutineInfo> clientRouteMap = clientInfos.get(node.id()); + Map<UUID, LocalRoutineInfo> clientRoutineMap = clientInfos.get(node.id()); - if (clientRouteMap == null) { - clientRouteMap = new HashMap<>(); + if (clientRoutineMap == null) { + clientRoutineMap = new HashMap<>(); - Map<UUID, LocalRoutineInfo> old = clientInfos.put(node.id(), clientRouteMap); + Map<UUID, LocalRoutineInfo> old = clientInfos.put(node.id(), clientRoutineMap); assert old == null; } - clientRouteMap.put(routineId, new LocalRoutineInfo(data.projectionPredicate(), + clientRoutineMap.put(routineId, new LocalRoutineInfo(data.projectionPredicate(), hnd, data.bufferSize(), data.interval(), http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/7c51d946/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/query/continuous/IgniteCacheContinuousQueryClientTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/query/continuous/IgniteCacheContinuousQueryClientTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/query/continuous/IgniteCacheContinuousQueryClientTest.java index 7341dea..d66d1d0 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/query/continuous/IgniteCacheContinuousQueryClientTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/query/continuous/IgniteCacheContinuousQueryClientTest.java @@ -22,6 +22,7 @@ import org.apache.ignite.cache.query.*; import org.apache.ignite.configuration.*; import org.apache.ignite.internal.util.typedef.internal.*; import org.apache.ignite.resources.*; +import org.apache.ignite.spi.discovery.tcp.*; import org.apache.ignite.spi.discovery.tcp.ipfinder.*; import org.apache.ignite.spi.discovery.tcp.ipfinder.vm.*; import org.apache.ignite.testframework.junits.common.*; @@ -39,7 +40,7 @@ import static org.apache.ignite.cache.CacheWriteSynchronizationMode.*; */ public class IgniteCacheContinuousQueryClientTest extends GridCommonAbstractTest { /** */ - protected static TcpDiscoveryIpFinder ipFinder = new TcpDiscoveryVmIpFinder(true); + private static TcpDiscoveryIpFinder ipFinder = new TcpDiscoveryVmIpFinder(true); /** */ private boolean client; @@ -48,6 +49,8 @@ public class IgniteCacheContinuousQueryClientTest extends GridCommonAbstractTest @Override protected IgniteConfiguration getConfiguration(String gridName) throws Exception { IgniteConfiguration cfg = super.getConfiguration(gridName); + ((TcpDiscoverySpi)cfg.getDiscoverySpi()).setIpFinder(ipFinder); + CacheConfiguration ccfg = new CacheConfiguration(); ccfg.setCacheMode(PARTITIONED);
