ignite-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From sboi...@apache.org
Subject ignite git commit: ignite-5566
Date Thu, 22 Jun 2017 10:24:32 GMT
Repository: ignite
Updated Branches:
  refs/heads/ignite-2.1.2-exchange 0205573a9 -> 323ab3a10


ignite-5566

(cherry picked from commit 060feac)


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

Branch: refs/heads/ignite-2.1.2-exchange
Commit: 323ab3a101f1a607b556973123b379ec53936beb
Parents: 0205573
Author: sboikov <sboikov@gridgain.com>
Authored: Thu Jun 22 12:15:07 2017 +0300
Committer: sboikov <sboikov@gridgain.com>
Committed: Thu Jun 22 13:23:13 2017 +0300

----------------------------------------------------------------------
 .../spi/communication/tcp/TcpCommunicationSpi.java    | 14 +++-----------
 1 file changed, 3 insertions(+), 11 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/ignite/blob/323ab3a1/modules/core/src/main/java/org/apache/ignite/spi/communication/tcp/TcpCommunicationSpi.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/spi/communication/tcp/TcpCommunicationSpi.java
b/modules/core/src/main/java/org/apache/ignite/spi/communication/tcp/TcpCommunicationSpi.java
index 88d3ca6..e3480e6 100755
--- a/modules/core/src/main/java/org/apache/ignite/spi/communication/tcp/TcpCommunicationSpi.java
+++ b/modules/core/src/main/java/org/apache/ignite/spi/communication/tcp/TcpCommunicationSpi.java
@@ -2332,6 +2332,9 @@ public class TcpCommunicationSpi extends IgniteSpiAdapter implements
Communicati
 
         unregisterMBean();
 
+        if (nioSrvr != null)
+            nioSrvr.stop();
+
         U.interrupt(commWorker);
         U.join(commWorker, log);
 
@@ -2373,17 +2376,6 @@ public class TcpCommunicationSpi extends IgniteSpiAdapter implements
Communicati
         if (connectGate != null)
             connectGate.stopped();
 
-        if (nioSrvr != null)
-            nioSrvr.stop();
-
-        // Force closing.
-        for (GridCommunicationClient[] clients0 : clients.values()) {
-            for (GridCommunicationClient client : clients0) {
-                if (client != null)
-                    client.forceClose();
-            }
-        }
-
         getSpiContext().deregisterPorts();
 
         getSpiContext().removeLocalEventListener(discoLsnr);


Mime
View raw message