ignite-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From sevdoki...@apache.org
Subject incubator-ignite git commit: # IGNITE-709 Bug fix: don't forget to clear TcpClientDiscovery.reconFailed flag.
Date Tue, 21 Apr 2015 20:19:03 GMT
Repository: incubator-ignite
Updated Branches:
  refs/heads/ignite-709 e14cc876d -> df24fbdf0


# IGNITE-709 Bug fix: don't forget to clear TcpClientDiscovery.reconFailed flag.


Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/df24fbdf
Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/df24fbdf
Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/df24fbdf

Branch: refs/heads/ignite-709
Commit: df24fbdf04e03b5588bfbf1baa4c845f0428f362
Parents: e14cc87
Author: sevdokimov <sergey.evdokimov@jetbrains.com>
Authored: Tue Apr 21 23:18:50 2015 +0300
Committer: sevdokimov <sergey.evdokimov@jetbrains.com>
Committed: Tue Apr 21 23:18:50 2015 +0300

----------------------------------------------------------------------
 .../spi/discovery/tcp/TcpClientDiscoverySpi.java      | 14 ++++++--------
 1 file changed, 6 insertions(+), 8 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/df24fbdf/modules/core/src/main/java/org/apache/ignite/spi/discovery/tcp/TcpClientDiscoverySpi.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/spi/discovery/tcp/TcpClientDiscoverySpi.java
b/modules/core/src/main/java/org/apache/ignite/spi/discovery/tcp/TcpClientDiscoverySpi.java
index 4cd5118..e62c5dc 100644
--- a/modules/core/src/main/java/org/apache/ignite/spi/discovery/tcp/TcpClientDiscoverySpi.java
+++ b/modules/core/src/main/java/org/apache/ignite/spi/discovery/tcp/TcpClientDiscoverySpi.java
@@ -445,6 +445,8 @@ public class TcpClientDiscoverySpi extends TcpDiscoverySpiAdapter implements
Tcp
 
                         stats.onClientSocketInitialized(U.currentTimeMillis() - ts);
 
+                        reconFailed = false;
+
                         locNode.clientRouterNodeId(rmtNodeId);
 
                         TcpDiscoveryAbstractMessage msg = recon ?
@@ -1161,22 +1163,18 @@ public class TcpClientDiscoverySpi extends TcpDiscoverySpiAdapter
implements Tcp
                     finally {
                         pending = false;
                     }
-
-                    joinErr = null;
-                    reconFailed = false;
-
-                    joinLatch.countDown();
                 }
                 else {
-                    joinErr = null;
                     reconFailed = true;
 
                     getSpiContext().recordEvent(new DiscoveryEvent(locNode,
                         "Client node disconnected: " + locNode,
                         EVT_CLIENT_NODE_DISCONNECTED, locNode));
-
-                    joinLatch.countDown();
                 }
+
+                joinErr = null;
+
+                joinLatch.countDown();
             }
             else if (log.isDebugEnabled())
                 log.debug("Discarding reconnect message for another client: " + msg);


Mime
View raw message