ignite-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From sevdoki...@apache.org
Subject [1/2] incubator-ignite git commit: # IGNITE-709 Bug fix: reconect timeout
Date Thu, 14 May 2015 13:20:58 GMT
Repository: incubator-ignite
Updated Branches:
  refs/heads/ignite-709_2 cb762a487 -> bcff21030


# IGNITE-709 Bug fix: reconect timeout


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

Branch: refs/heads/ignite-709_2
Commit: 71f917255055d8682bb39a3b1526ccae89ec572a
Parents: cb762a4
Author: sevdokimov <sevdokimov@gridgain.com>
Authored: Thu May 14 15:07:03 2015 +0300
Committer: sevdokimov <sevdokimov@gridgain.com>
Committed: Thu May 14 15:07:03 2015 +0300

----------------------------------------------------------------------
 .../ignite/spi/discovery/tcp/TcpClientDiscoverySpi.java   | 10 ++++------
 1 file changed, 4 insertions(+), 6 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/71f91725/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 3c46515..8cdd7d1 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
@@ -65,9 +65,6 @@ public class TcpClientDiscoverySpi extends TcpDiscoverySpiAdapter implements
Tcp
     private static final Object JOIN_TIMEOUT = "JOIN_TIMEOUT";
 
     /** */
-    private static final Object RECONNECT_TIMEOUT = "RECONNECT_TIMEOUT";
-
-    /** */
     private static final Object SPI_STOP = "SPI_STOP";
 
     /** */
@@ -1025,19 +1022,20 @@ public class TcpClientDiscoverySpi extends TcpDiscoverySpiAdapter
implements Tcp
                                 else {
                                     assert reconnector == null;
 
-                                    reconnector = new Reconnector();
+                                    final Reconnector reconnector = new Reconnector();
+                                    this.reconnector = reconnector;
                                     reconnector.start();
 
                                     timer.schedule(new TimerTask() {
                                         @Override public void run() {
-                                            msgWorker.addMessage(RECONNECT_TIMEOUT);
+                                            reconnector.cancel();
                                         }
                                     }, netTimeout);
                                 }
                             }
                         }
                     }
-                    else if (msg == SPI_RECONNECT_FAILED || msg == RECONNECT_TIMEOUT) {
+                    else if (msg == SPI_RECONNECT_FAILED) {
                         if (!segmented) {
                             segmented = true;
 


Mime
View raw message