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 2015/09/01 14:08:06 UTC
[57/82] [abbrv] ignite git commit: ignite-1294: minor fixes and
improvements in the processing of incoming SPI communication session
ignite-1294: minor fixes and improvements in the processing of incoming SPI communication session
Project: http://git-wip-us.apache.org/repos/asf/ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/90d84384
Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/90d84384
Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/90d84384
Branch: refs/heads/ignite-1093-2
Commit: 90d8438473391fdf86656cc50108be723f306428
Parents: 1335580
Author: Denis Magda <dm...@gridgain.com>
Authored: Mon Aug 31 17:50:40 2015 +0300
Committer: Denis Magda <dm...@gridgain.com>
Committed: Mon Aug 31 17:50:40 2015 +0300
----------------------------------------------------------------------
.../spi/communication/tcp/TcpCommunicationSpi.java | 12 +++++-------
1 file changed, 5 insertions(+), 7 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ignite/blob/90d84384/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 25b219b..afe5d28 100644
--- 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
@@ -390,6 +390,8 @@ public class TcpCommunicationSpi extends IgniteSpiAdapter
ses.send(new RecoveryLastReceivedMessage(-1));
+ fut.onDone(oldClient);
+
return;
}
else {
@@ -433,12 +435,8 @@ public class TcpCommunicationSpi extends IgniteSpiAdapter
boolean reserved = recoveryDesc.tryReserve(msg0.connectCount(),
new ConnectClosure(ses, recoveryDesc, rmtNode, msg0, !hasShmemClient, fut));
- if (reserved) {
- GridTcpNioCommunicationClient client =
- connected(recoveryDesc, ses, rmtNode, msg0.received(), true, !hasShmemClient);
-
- fut.onDone(client);
- }
+ if (reserved)
+ connected(recoveryDesc, ses, rmtNode, msg0.received(), true, !hasShmemClient);
}
}
}
@@ -1413,7 +1411,7 @@ public class TcpCommunicationSpi extends IgniteSpiAdapter
if (slowClientQueueLimit > 0 && msgQueueLimit > 0 && slowClientQueueLimit >= msgQueueLimit) {
U.quietAndWarn(log, "Slow client queue limit is set to a value greater than message queue limit " +
"(slow client queue limit will have no effect) [msgQueueLimit=" + msgQueueLimit +
- ", slowClientQueueLimit=" + slowClientQueueLimit + ']');
+ ", slowClientQueueLimit=" + slowClientQueueLimit + ']');
}
registerMBean(gridName, this, TcpCommunicationSpiMBean.class);