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/07/07 13:26:41 UTC
[5/6] incubator-ignite git commit: ignite-747: generic fix after the
review
ignite-747: generic fix after the review
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/74c77643
Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/74c77643
Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/74c77643
Branch: refs/heads/ignite-747
Commit: 74c776431478980562f3396a089a88bb5a0b836f
Parents: ee7f721
Author: Denis Magda <dm...@gridgain.com>
Authored: Tue Jul 7 14:21:53 2015 +0300
Committer: Denis Magda <dm...@gridgain.com>
Committed: Tue Jul 7 14:21:53 2015 +0300
----------------------------------------------------------------------
.../main/java/org/apache/ignite/spi/discovery/tcp/ServerImpl.java | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/74c77643/modules/core/src/main/java/org/apache/ignite/spi/discovery/tcp/ServerImpl.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/spi/discovery/tcp/ServerImpl.java b/modules/core/src/main/java/org/apache/ignite/spi/discovery/tcp/ServerImpl.java
index d95ac3b..a8be5d3 100644
--- a/modules/core/src/main/java/org/apache/ignite/spi/discovery/tcp/ServerImpl.java
+++ b/modules/core/src/main/java/org/apache/ignite/spi/discovery/tcp/ServerImpl.java
@@ -2858,7 +2858,8 @@ class ServerImpl extends TcpDiscoveryImpl {
else if (!locNodeId.equals(node.id()) && ring.node(node.id()) != null) {
// Local node already has node from message in local topology.
// Just pass it to coordinator via the ring.
- sendMessageAcrossRing(msg);
+ if (ring.hasRemoteNodes())
+ sendMessageAcrossRing(msg);
if (log.isDebugEnabled())
log.debug("Local node already has node being added. Passing TcpDiscoveryNodeAddedMessage to " +