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/04/10 19:07:35 UTC
[39/40] incubator-ignite git commit: # ignite-537
# ignite-537
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/9f44423c
Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/9f44423c
Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/9f44423c
Branch: refs/heads/ignite-537
Commit: 9f44423cd819f76e636aad82bb777253b56db412
Parents: 9837a4a
Author: sboikov <se...@inria.fr>
Authored: Fri Apr 10 20:06:07 2015 +0300
Committer: sboikov <se...@inria.fr>
Committed: Fri Apr 10 20:06:07 2015 +0300
----------------------------------------------------------------------
.../org/apache/ignite/spi/discovery/tcp/TcpDiscoverySpi.java | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/9f44423c/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 7da004a..82a2e59 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
@@ -5504,7 +5504,7 @@ public class TcpDiscoverySpi extends TcpDiscoverySpiAdapter implements TcpDiscov
}
}
- p2pLdrs.remove(nodeId, this);
+ p2pLdrs.remove(node.id(), this);
return null;
}
@@ -5568,7 +5568,7 @@ public class TcpDiscoverySpi extends TcpDiscoverySpiAdapter implements TcpDiscov
TcpDiscoveryHandshakeResponse res = readMessage(sock, null, netTimeout);
- if (!res.creatorNodeId().equals(nodeId))
+ if (!res.creatorNodeId().equals(node.id()))
return null;
stats.onClientSocketInitialized(U.currentTimeMillis() - tstamp);