IGNITE-80 - Fixed continuous query registration.
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/9d63fc6c Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/9d63fc6c Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/9d63fc6c Branch: refs/heads/ignite-80 Commit: 9d63fc6ca365378b40f790b068deb24022545f09 Parents: 2f04a48 Author: Alexey Goncharuk <agoncha...@gridgain.com> Authored: Thu Apr 23 19:35:48 2015 -0700 Committer: Alexey Goncharuk <agoncha...@gridgain.com> Committed: Thu Apr 23 19:35:48 2015 -0700 ---------------------------------------------------------------------- .../internal/processors/continuous/GridContinuousProcessor.java | 3 ++- .../java/org/apache/ignite/spi/discovery/tcp/TcpDiscoverySpi.java | 3 ++- 2 files changed, 4 insertions(+), 2 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/9d63fc6c/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 edaf5d9..74104b4 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 @@ -324,7 +324,8 @@ public class GridContinuousProcessor extends GridProcessorAdapter { try { // Create empty pending set. - pending.put(nodeId, new HashSet<GridContinuousMessage>()); + if (pending.get(nodeId) == null) + pending.put(nodeId, new HashSet<GridContinuousMessage>()); DiscoveryData data = new DiscoveryData(ctx.localNodeId()); http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/9d63fc6c/modules/core/src/main/java/org/apache/ignite/spi/discovery/tcp/TcpDiscoverySpi.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/spi/discovery/tcp/TcpDiscoverySpi.java b/modules/core/src/main/java/org/apache/ignite/spi/discovery/tcp/TcpDiscoverySpi.java index b765e1f..c2eb6b2 100644 --- a/modules/core/src/main/java/org/apache/ignite/spi/discovery/tcp/TcpDiscoverySpi.java +++ b/modules/core/src/main/java/org/apache/ignite/spi/discovery/tcp/TcpDiscoverySpi.java @@ -3758,7 +3758,8 @@ public class TcpDiscoverySpi extends TcpDiscoverySpiAdapter implements TcpDiscov } if (!locNodeId.equals(nodeId)) { - msg.addDiscoveryData(locNodeId, collectExchangeData(msg.nodeId())); + if (locNode.order() != 0 && locNode.order() < node.order()) + msg.addDiscoveryData(locNodeId, collectExchangeData(msg.nodeId())); Map<Integer, byte[]> data = msg.newNodeDiscoveryData();
