Merging IGNITE-1164
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/abb2cef1 Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/abb2cef1 Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/abb2cef1 Branch: refs/heads/ignite-1161 Commit: abb2cef136da824c55964bb4032c47dd150242c1 Parents: 44072f8 Author: Denis Magda <dma...@gridgain.com> Authored: Fri Jul 31 13:41:41 2015 +0300 Committer: Yakov Zhdanov <yzhda...@gridgain.com> Committed: Fri Jul 31 13:41:41 2015 +0300 ---------------------------------------------------------------------- .../main/java/org/apache/ignite/spi/discovery/tcp/ServerImpl.java | 3 +++ 1 file changed, 3 insertions(+) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/abb2cef1/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 47ba8e6..90133d6 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 @@ -2759,6 +2759,9 @@ class ServerImpl extends TcpDiscoveryImpl { if (routerNode.id().equals(getLocalNodeId())) { ClientMessageWorker worker = clientMsgWorkers.get(node.id()); + if (worker == null) + throw new IgniteSpiException("Client node already disconnected: " + node); + msg.verify(getLocalNodeId()); // Client worker require verified messages. worker.addMessage(msg);
