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/08/12 10:26:49 UTC
incubator-ignite git commit: # ignite-1229 review
Repository: incubator-ignite
Updated Branches:
refs/heads/ignite-1229 a463d1dc6 -> ad54cae3c
# ignite-1229 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/ad54cae3
Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/ad54cae3
Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/ad54cae3
Branch: refs/heads/ignite-1229
Commit: ad54cae3c5918383d6ea978484105d9aab17445f
Parents: a463d1d
Author: sboikov <sb...@gridgain.com>
Authored: Wed Aug 12 11:21:40 2015 +0300
Committer: sboikov <sb...@gridgain.com>
Committed: Wed Aug 12 11:26:29 2015 +0300
----------------------------------------------------------------------
.../java/org/apache/ignite/spi/discovery/tcp/ServerImpl.java | 4 +++-
1 file changed, 3 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/ad54cae3/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 dbfbc57..76144e3 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
@@ -424,7 +424,7 @@ class ServerImpl extends TcpDiscoveryImpl {
node = ring.node(node.clientRouterNodeId());
- if (!nodeAlive(node.id()))
+ if (node == null || !nodeAlive(node.id()))
return false;
}
@@ -551,6 +551,8 @@ class ServerImpl extends TcpDiscoveryImpl {
log.debug("Failed to ping the node (has left or leaving topology): [nodeId=" + nodeId +
']');
+ fut.onDone((IgniteBiTuple<UUID, Boolean>)null);
+
return null;
}