Repository: ignite Updated Branches: refs/heads/ignite-1758 3f996cecb -> 893054d11
ignite-1758 Project: http://git-wip-us.apache.org/repos/asf/ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/893054d1 Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/893054d1 Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/893054d1 Branch: refs/heads/ignite-1758 Commit: 893054d11e0be89b57ace5ac33140a82c088cdcc Parents: 3f996ce Author: sboikov <[email protected]> Authored: Mon Oct 26 14:27:39 2015 +0300 Committer: sboikov <[email protected]> Committed: Mon Oct 26 14:27:39 2015 +0300 ---------------------------------------------------------------------- .../org/apache/ignite/spi/discovery/tcp/ServerImpl.java | 2 +- .../spi/discovery/tcp/TcpDiscoveryMultiThreadedTest.java | 9 ++++++++- 2 files changed, 9 insertions(+), 2 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ignite/blob/893054d1/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 6163834..8c63eb2 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 @@ -2136,7 +2136,7 @@ class ServerImpl extends TcpDiscoveryImpl { else assert false : "Unknown message type: " + msg.getClass().getSimpleName(); - if (msg.verified() && spi.ensured(msg)) + if (spi.ensured(msg) && redirectToClients(msg)) msgHist.add(msg); if (msg.senderNodeId() != null && !msg.senderNodeId().equals(getLocalNodeId())) { http://git-wip-us.apache.org/repos/asf/ignite/blob/893054d1/modules/core/src/test/java/org/apache/ignite/spi/discovery/tcp/TcpDiscoveryMultiThreadedTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/spi/discovery/tcp/TcpDiscoveryMultiThreadedTest.java b/modules/core/src/test/java/org/apache/ignite/spi/discovery/tcp/TcpDiscoveryMultiThreadedTest.java index 044ea44..ea22c8c 100644 --- a/modules/core/src/test/java/org/apache/ignite/spi/discovery/tcp/TcpDiscoveryMultiThreadedTest.java +++ b/modules/core/src/test/java/org/apache/ignite/spi/discovery/tcp/TcpDiscoveryMultiThreadedTest.java @@ -26,6 +26,7 @@ import java.util.concurrent.atomic.AtomicBoolean; import java.util.concurrent.atomic.AtomicInteger; import java.util.concurrent.atomic.AtomicReference; import org.apache.ignite.Ignite; +import org.apache.ignite.IgniteClientDisconnectedException; import org.apache.ignite.configuration.IgniteConfiguration; import org.apache.ignite.internal.IgniteInternalFuture; import org.apache.ignite.internal.IgniteKernal; @@ -181,7 +182,13 @@ public class TcpDiscoveryMultiThreadedTest extends GridCommonAbstractTest { while (!done.get() && error.get() == null) { stopGrid(idx); - startGrid(idx); + + try { + startGrid(idx); + } + catch (IgniteClientDisconnectedException e) { + log.info("Client disconnected: " + e); + } } } catch (Throwable e) {
