#ignite-1109: merge

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

Branch: refs/heads/ignite-1109
Commit: 80c114c36120bf82536325e49a2e8b15858abcf3
Parents: 978aa39
Author: ivasilinets <ivasilin...@gridgain.com>
Authored: Mon Jul 20 11:29:36 2015 +0300
Committer: ivasilinets <ivasilin...@gridgain.com>
Committed: Mon Jul 20 11:29:36 2015 +0300

----------------------------------------------------------------------
 .../apache/ignite/spi/discovery/tcp/internal/TcpDiscoveryNode.java | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/80c114c3/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 f3cc7b3..e7562fc 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
@@ -456,7 +456,7 @@ public class TcpDiscoveryNode extends 
GridMetadataAwareAdapter implements Cluste
      * @return Copy of local node for client reconnect request.
      */
     public TcpDiscoveryNode clientReconnectNode() {
-        TcpDiscoveryNode node = new TcpDiscoveryNode(id, addrs, hostNames, 
discPort, metricsProvider, ver);
+        TcpDiscoveryNode node = new TcpDiscoveryNode(id, addrs, hostNames, 
discPort, metricsProvider, ver, null);
 
         node.attrs = attrs;
         node.clientRouterNodeId = clientRouterNodeId;

Reply via email to