ignite-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From sboi...@apache.org
Subject [1/2] ignite git commit: zk
Date Mon, 13 Nov 2017 11:25:01 GMT
Repository: ignite
Updated Branches:
  refs/heads/ignite-zk 740c3b24f -> 6ed2564a8


zk


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

Branch: refs/heads/ignite-zk
Commit: 9970b95029f1c94ec027aaa38fdfda5719e79cfe
Parents: 740c3b2
Author: sboikov <sboikov@gridgain.com>
Authored: Mon Nov 13 13:25:06 2017 +0300
Committer: sboikov <sboikov@gridgain.com>
Committed: Mon Nov 13 13:25:06 2017 +0300

----------------------------------------------------------------------
 .../apache/ignite/spi/discovery/zk/ZookeeperClusterNode.java    | 2 +-
 .../apache/ignite/spi/discovery/zk/ZookeeperDiscoverySpi.java   | 5 ++---
 2 files changed, 3 insertions(+), 4 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/ignite/blob/9970b950/modules/zookeeper/src/main/java/org/apache/ignite/spi/discovery/zk/ZookeeperClusterNode.java
----------------------------------------------------------------------
diff --git a/modules/zookeeper/src/main/java/org/apache/ignite/spi/discovery/zk/ZookeeperClusterNode.java
b/modules/zookeeper/src/main/java/org/apache/ignite/spi/discovery/zk/ZookeeperClusterNode.java
index 1f16865..dc0f374 100644
--- a/modules/zookeeper/src/main/java/org/apache/ignite/spi/discovery/zk/ZookeeperClusterNode.java
+++ b/modules/zookeeper/src/main/java/org/apache/ignite/spi/discovery/zk/ZookeeperClusterNode.java
@@ -202,6 +202,6 @@ public class ZookeeperClusterNode implements ClusterNode, Serializable
{
 
     /** {@inheritDoc} */
     @Override public String toString() {
-        return "ZookeeperClusterNode [id=" + id + ", order=" + order + ']';
+        return "ZookeeperClusterNode [id=" + id + ", order=" + order + ", client=" + client
+ ']';
     }
 }

http://git-wip-us.apache.org/repos/asf/ignite/blob/9970b950/modules/zookeeper/src/main/java/org/apache/ignite/spi/discovery/zk/ZookeeperDiscoverySpi.java
----------------------------------------------------------------------
diff --git a/modules/zookeeper/src/main/java/org/apache/ignite/spi/discovery/zk/ZookeeperDiscoverySpi.java
b/modules/zookeeper/src/main/java/org/apache/ignite/spi/discovery/zk/ZookeeperDiscoverySpi.java
index 04dc947..f36a6e2 100644
--- a/modules/zookeeper/src/main/java/org/apache/ignite/spi/discovery/zk/ZookeeperDiscoverySpi.java
+++ b/modules/zookeeper/src/main/java/org/apache/ignite/spi/discovery/zk/ZookeeperDiscoverySpi.java
@@ -684,10 +684,9 @@ public class ZookeeperDiscoverySpi extends IgniteSpiAdapter implements
Discovery
 
                     ZKNodeData data = joinHist.get(joined.order);
 
-                    ZKJoiningNodeData joinData = data.joinData;
+                    assert data != null : joined;
 
-                    if (joinData == null)
-                        System.out.println();
+                    ZKJoiningNodeData joinData = data.joinData;
 
                     assert joinData != null : data;
 


Mime
View raw message