Repository: incubator-ignite
Updated Branches:
  refs/heads/ignite-1164 [created] 9b78fa6df


ignite-1164: fixed NPE in tcp discovery


Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/9b78fa6d
Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/9b78fa6d
Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/9b78fa6d

Branch: refs/heads/ignite-1164
Commit: 9b78fa6dfcd68df3cb64a54588cf7df84a143f96
Parents: 5288b2d
Author: Denis Magda <[email protected]>
Authored: Wed Jul 29 12:49:57 2015 +0300
Committer: nikolay_tikhonov <[email protected]>
Committed: Thu Jul 30 09:32:22 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/9b78fa6d/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 547347c..56078e7 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
@@ -2753,6 +2753,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);

Reply via email to