Repository: ignite Updated Branches: refs/heads/ignite-1758 257133382 -> 0ef5769d4
ignite-1758 debug Project: http://git-wip-us.apache.org/repos/asf/ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/0ef5769d Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/0ef5769d Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/0ef5769d Branch: refs/heads/ignite-1758 Commit: 0ef5769d4ded30c93351d761073d541c7f8ec360 Parents: 2571333 Author: sboikov <[email protected]> Authored: Mon Nov 9 09:35:05 2015 +0300 Committer: sboikov <[email protected]> Committed: Mon Nov 9 09:35:05 2015 +0300 ---------------------------------------------------------------------- .../ignite/spi/discovery/tcp/ServerImpl.java | 23 +++++++++++++++----- 1 file changed, 17 insertions(+), 6 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ignite/blob/0ef5769d/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 1c009e9..9084713 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 @@ -1918,11 +1918,15 @@ class ServerImpl extends TcpDiscoveryImpl { * @param msg Message to add. */ void add(TcpDiscoveryAbstractMessage msg) { + debugLog(msg, "add pending: " + msg); + msgs.add(msg); while (msgs.size() > MAX) { TcpDiscoveryAbstractMessage polled = msgs.poll(); + debugLog(polled, "polled: " + polled); + assert polled != null; if (polled.id().equals(discardId)) @@ -1941,13 +1945,20 @@ class ServerImpl extends TcpDiscoveryImpl { @Nullable IgniteUuid discardId, @Nullable IgniteUuid customDiscardId ) { -// this.msgs.clear(); -// - if (msgs != null) + for (TcpDiscoveryAbstractMessage msg : this.msgs) + debugLog(msg, "reset pending: " + msg); + + this.msgs.clear(); + + if (msgs != null) { + for (TcpDiscoveryAbstractMessage msg : msgs) + debugLog(msg, "reset add pending: " + msg); + this.msgs.addAll(msgs); -// -// this.discardId = discardId; -// this.customDiscardId = customDiscardId; + } + + this.discardId = discardId; + this.customDiscardId = customDiscardId; } /**
