Return-Path: X-Original-To: apmail-ignite-commits-archive@minotaur.apache.org Delivered-To: apmail-ignite-commits-archive@minotaur.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id E3C4318028 for ; Fri, 24 Apr 2015 02:37:55 +0000 (UTC) Received: (qmail 88502 invoked by uid 500); 24 Apr 2015 02:37:55 -0000 Delivered-To: apmail-ignite-commits-archive@ignite.apache.org Received: (qmail 88473 invoked by uid 500); 24 Apr 2015 02:37:55 -0000 Mailing-List: contact commits-help@ignite.incubator.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@ignite.incubator.apache.org Delivered-To: mailing list commits@ignite.incubator.apache.org Received: (qmail 88464 invoked by uid 99); 24 Apr 2015 02:37:55 -0000 Received: from nike.apache.org (HELO nike.apache.org) (192.87.106.230) by apache.org (qpsmtpd/0.29) with ESMTP; Fri, 24 Apr 2015 02:37:55 +0000 X-ASF-Spam-Status: No, hits=-0.0 required=5.0 tests=SPF_PASS X-Spam-Check-By: apache.org Received-SPF: pass (nike.apache.org: local policy) Received: from [54.76.25.247] (HELO mx1-eu-west.apache.org) (54.76.25.247) by apache.org (qpsmtpd/0.29) with ESMTP; Fri, 24 Apr 2015 02:37:30 +0000 Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by mx1-eu-west.apache.org (ASF Mail Server at mx1-eu-west.apache.org) with SMTP id 0AE572532F for ; Fri, 24 Apr 2015 02:37:28 +0000 (UTC) Received: (qmail 84105 invoked by uid 99); 24 Apr 2015 02:36:13 -0000 Received: from git1-us-west.apache.org (HELO git1-us-west.apache.org) (140.211.11.23) by apache.org (qpsmtpd/0.29) with ESMTP; Fri, 24 Apr 2015 02:36:13 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id 4285DE17DC; Fri, 24 Apr 2015 02:36:13 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: agoncharuk@apache.org To: commits@ignite.incubator.apache.org Date: Fri, 24 Apr 2015 02:37:01 -0000 Message-Id: <72c625e89400467bba710a411af42ab3@git.apache.org> In-Reply-To: References: X-Mailer: ASF-Git Admin Mailer Subject: [50/50] incubator-ignite git commit: IGNITE-80 - Fixed continuous query registration. X-Virus-Checked: Checked by ClamAV on apache.org 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 Authored: Thu Apr 23 19:35:48 2015 -0700 Committer: Alexey Goncharuk 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()); + if (pending.get(nodeId) == null) + pending.put(nodeId, new HashSet()); 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 data = msg.newNodeDiscoveryData();