commit 8454eaa17ccae596a6d7e5a02bfeb1f8ac792ed9
author sboikov <sboikov@gridgain.com> Mon Apr 24 22:48:39 2017 +0300
committer sboikov <sboikov@gridgain.com> Mon Apr 24 22:48:39 2017 +0300
tree 897cb3b64ca6bd66c852aa011303ee922abb7a48
parent 2aa60b38b73e648ea74c7eb6b6e2c671951f2a3e

ignite-3054

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 d7d377d..572c4ad 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
@@ -5669,7 +5669,7 @@
                                 throw new IgniteSpiException("Failed to perform SSL handshake.");
                         }
                         catch (SSLException | IgniteCheckedException e) {
-                            log.warning("Failed to perform SSL handshake. [socket=" + sock + "]", e);
+                            U.warn(log, "Failed to perform SSL handshake [sock=" + sock + "]", e);
 
                             U.closeQuiet(sock);
                             U.closeQuiet(ch);
@@ -6161,7 +6161,7 @@
                         msgProc.processMessage(wrkr, msg);
                     }
                     catch (IgniteCheckedException e) {
-                        log.error("Failure processing message, closing connection. [ses=" + ses + ']', e);
+                        U.error(log, "Failure processing message, closing connection [ses=" + ses + ']', e);
 
                         wrkr.nonblockingStop();
                     }
@@ -6441,8 +6441,6 @@
                     TcpDiscoveryHandshakeResponse res =
                         new TcpDiscoveryHandshakeResponse(locNodeId, locNode.internalOrder());
 
-                    boolean asyncMode = req.client();
-
                     // It can happen if a remote node is stopped and it has a loopback address in the list of addresses,
                     // the local node sends a handshake request message on the loopback address, so we get here.
                     if (locNodeId.equals(nodeId)) {
@@ -6455,9 +6453,7 @@
                     }
 
                     if (req.client()) {
-                        ClientMessageProcessor clientProc = asyncMode
-                            ? new ClientNioMessageWorker(nodeId, sock)
-                            : new ClientMessageWorker(sock, nodeId);
+                        ClientMessageProcessor clientProc = new ClientNioMessageWorker(nodeId, sock);
 
                         while (true) {
                             ClientMessageProcessor old = clientMsgWorkers.putIfAbsent(nodeId, clientProc);
@@ -7354,9 +7350,6 @@
      *
      */
     private static class GridPingFutureAdapter<R> extends GridFutureAdapter<R> {
-        /** */
-        private static final long serialVersionUID = 0L;
-
         /** Socket. */
         private volatile Socket sock;
 
@@ -7720,7 +7713,8 @@
                     }
 
                 }
-            } catch (IgniteCheckedException e) {
+            }
+            catch (IgniteCheckedException e) {
                 throw new IOException(e.getMessage(), e);
             }
         }