[2/6] ignite git commit: ignite-4154

[sboikov]

ignite-4154


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

Branch: refs/heads/ignite-4154-2
Commit: d4568ff86cd6af332b1789b52e170f8906c5aee0
Parents: a8ed7a7
Author: sboikov <sboi...@gridgain.com>
Authored: Tue Nov 1 20:18:12 2016 +0300
Committer: sboikov <sboi...@gridgain.com>
Committed: Tue Nov 1 20:18:12 2016 +0300

----------------------------------------------------------------------
 .../java/org/apache/ignite/spi/discovery/tcp/ServerImpl.java  | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/ignite/blob/d4568ff8/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 d03ba5b..ee58421 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
@@ -2148,13 +2148,14 @@ class ServerImpl extends TcpDiscoveryImpl {
          * @param id Discarded message ID.
          * @param custom {@code True} if discard for {@link 
TcpDiscoveryCustomEventMessage}.
          */
-        void discard(IgniteUuid id, boolean custom) {
+        void discard(IgniteUuid id, boolean custom, boolean cleanup) {
             if (custom)
                 customDiscardId = id;
             else
                 discardId = id;
 
-            cleanup();
+            if (cleanup)
+                cleanup();
         }
 
         /**
@@ -4932,7 +4933,7 @@ class ServerImpl extends TcpDiscoveryImpl {
             }
 
             if (msg.verified())
-                pendingMsgs.discard(msgId, msg.customMessageDiscard());
+                pendingMsgs.discard(msgId, msg.customMessageDiscard(), 
spiState == CONNECTED);
 
             if (ring.hasRemoteNodes())
                 sendMessageAcrossRing(msg);