Repository: ignite Updated Branches: refs/heads/ignite-1758 363a38ab9 -> 12fc32344
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/12fc3234 Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/12fc3234 Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/12fc3234 Branch: refs/heads/ignite-1758 Commit: 12fc32344faec4f8eca6ca0ed37de28c7f7ab1c7 Parents: 363a38a Author: sboikov <[email protected]> Authored: Mon Nov 2 12:10:48 2015 +0300 Committer: sboikov <[email protected]> Committed: Mon Nov 2 12:10:48 2015 +0300 ---------------------------------------------------------------------- .../java/org/apache/ignite/spi/discovery/tcp/ServerImpl.java | 4 +++- .../tcp/messages/TcpDiscoveryClientReconnectMessage.java | 1 + 2 files changed, 4 insertions(+), 1 deletion(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ignite/blob/12fc3234/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 aa12890..c39caba 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 @@ -1778,7 +1778,9 @@ class ServerImpl extends TcpDiscoveryImpl { Collection<TcpDiscoveryNode> top = new ArrayList<>(allNodes.size()); for (TcpDiscoveryNode n0 : allNodes) { - if (n0.internalOrder() != 0 && n0.internalOrder() < node.internalOrder()) + assert n0.internalOrder() > 0; + + if (n0.internalOrder() < node.internalOrder()) top.add(n0); } http://git-wip-us.apache.org/repos/asf/ignite/blob/12fc3234/modules/core/src/main/java/org/apache/ignite/spi/discovery/tcp/messages/TcpDiscoveryClientReconnectMessage.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/spi/discovery/tcp/messages/TcpDiscoveryClientReconnectMessage.java b/modules/core/src/main/java/org/apache/ignite/spi/discovery/tcp/messages/TcpDiscoveryClientReconnectMessage.java index c232e6c..7c0cd5d 100644 --- a/modules/core/src/main/java/org/apache/ignite/spi/discovery/tcp/messages/TcpDiscoveryClientReconnectMessage.java +++ b/modules/core/src/main/java/org/apache/ignite/spi/discovery/tcp/messages/TcpDiscoveryClientReconnectMessage.java @@ -26,6 +26,7 @@ import org.apache.ignite.lang.IgniteUuid; /** * Message telling that client node is reconnecting to topology. */ +@TcpDiscoveryEnsureDelivery public class TcpDiscoveryClientReconnectMessage extends TcpDiscoveryAbstractMessage { /** */ private static final long serialVersionUID = 0L;
