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 2017/04/24 19:48:51 UTC
ignite git commit: ignite-3054
Repository: ignite
Updated Branches:
refs/heads/ignite-3054 2aa60b38b -> 8454eaa17
ignite-3054
Project: http://git-wip-us.apache.org/repos/asf/ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/8454eaa1
Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/8454eaa1
Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/8454eaa1
Branch: refs/heads/ignite-3054
Commit: 8454eaa17ccae596a6d7e5a02bfeb1f8ac792ed9
Parents: 2aa60b3
Author: sboikov <sb...@gridgain.com>
Authored: Mon Apr 24 22:48:39 2017 +0300
Committer: sboikov <sb...@gridgain.com>
Committed: Mon Apr 24 22:48:39 2017 +0300
----------------------------------------------------------------------
.../apache/ignite/spi/discovery/tcp/ServerImpl.java | 16 +++++-----------
1 file changed, 5 insertions(+), 11 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ignite/blob/8454eaa1/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 @@ class ServerImpl extends TcpDiscoveryImpl {
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 @@ class ServerImpl extends TcpDiscoveryImpl {
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 @@ class ServerImpl extends TcpDiscoveryImpl {
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 @@ class ServerImpl extends TcpDiscoveryImpl {
}
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 @@ class ServerImpl extends TcpDiscoveryImpl {
*
*/
private static class GridPingFutureAdapter<R> extends GridFutureAdapter<R> {
- /** */
- private static final long serialVersionUID = 0L;
-
/** Socket. */
private volatile Socket sock;
@@ -7720,7 +7713,8 @@ class ServerImpl extends TcpDiscoveryImpl {
}
}
- } catch (IgniteCheckedException e) {
+ }
+ catch (IgniteCheckedException e) {
throw new IOException(e.getMessage(), e);
}
}