Repository: incubator-ignite Updated Branches: refs/heads/ignite-1109 4f8558673 -> a8d5bbe2f
#ignite-1109: fix readExternal for TcpDiscoveryNode. Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/a8d5bbe2 Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/a8d5bbe2 Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/a8d5bbe2 Branch: refs/heads/ignite-1109 Commit: a8d5bbe2fee42640c69da82ca4ce8d24a8128b76 Parents: 4f85586 Author: ivasilinets <ivasilin...@gridgain.com> Authored: Thu Jul 9 12:43:44 2015 +0300 Committer: ivasilinets <ivasilin...@gridgain.com> Committed: Thu Jul 9 12:43:44 2015 +0300 ---------------------------------------------------------------------- .../ignite/spi/discovery/tcp/internal/TcpDiscoveryNode.java | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/a8d5bbe2/modules/core/src/main/java/org/apache/ignite/spi/discovery/tcp/internal/TcpDiscoveryNode.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/spi/discovery/tcp/internal/TcpDiscoveryNode.java b/modules/core/src/main/java/org/apache/ignite/spi/discovery/tcp/internal/TcpDiscoveryNode.java index 065b3c0..0ba5f6f 100644 --- a/modules/core/src/main/java/org/apache/ignite/spi/discovery/tcp/internal/TcpDiscoveryNode.java +++ b/modules/core/src/main/java/org/apache/ignite/spi/discovery/tcp/internal/TcpDiscoveryNode.java @@ -507,8 +507,10 @@ public class TcpDiscoveryNode extends GridMetadataAwareAdapter implements Cluste sockAddrs = U.toSocketAddresses(this, discPort); - if (attrs.containsKey(ATTR_NODE_CONSISTENT_ID)) - consistentId = attrs.get(ATTR_NODE_CONSISTENT_ID); + Object consistentIdAttr = attrs.get(ATTR_NODE_CONSISTENT_ID); + + if (consistentIdAttr != null) + consistentId = consistentIdAttr; else consistentId = U.consistentId(addrs, discPort);
