You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@helix.apache.org by zz...@apache.org on 2014/07/29 01:12:25 UTC
git commit: [HELIX-491] ZKHelixManager#waitUntilConnected() bug,
rb=24016
Repository: helix
Updated Branches:
refs/heads/helix-0.6.2-release c8ff0dd8f -> 677dbf568
[HELIX-491] ZKHelixManager#waitUntilConnected() bug, rb=24016
Project: http://git-wip-us.apache.org/repos/asf/helix/repo
Commit: http://git-wip-us.apache.org/repos/asf/helix/commit/677dbf56
Tree: http://git-wip-us.apache.org/repos/asf/helix/tree/677dbf56
Diff: http://git-wip-us.apache.org/repos/asf/helix/diff/677dbf56
Branch: refs/heads/helix-0.6.2-release
Commit: 677dbf56814ce85561f4df4982c7d000eb617ec2
Parents: c8ff0dd
Author: zzhang <zz...@uci.edu>
Authored: Mon Jul 28 16:12:12 2014 -0700
Committer: zzhang <zz...@uci.edu>
Committed: Mon Jul 28 16:12:12 2014 -0700
----------------------------------------------------------------------
.../main/java/org/apache/helix/manager/zk/ZKHelixManager.java | 2 +-
pom.xml | 5 -----
2 files changed, 1 insertion(+), 6 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/helix/blob/677dbf56/helix-core/src/main/java/org/apache/helix/manager/zk/ZKHelixManager.java
----------------------------------------------------------------------
diff --git a/helix-core/src/main/java/org/apache/helix/manager/zk/ZKHelixManager.java b/helix-core/src/main/java/org/apache/helix/manager/zk/ZKHelixManager.java
index f0b5693..20285ed 100644
--- a/helix-core/src/main/java/org/apache/helix/manager/zk/ZKHelixManager.java
+++ b/helix-core/src/main/java/org/apache/helix/manager/zk/ZKHelixManager.java
@@ -721,7 +721,7 @@ public class ZKHelixManager implements HelixManager, IZkStateListener {
* at the time we read session-id, zkconnection might be lost again
* wait until we get a non-zero session-id
*/
- } while ("0".equals(_sessionId));
+ } while (!isConnected || "0".equals(_sessionId));
LOG.info("Handling new session, session id: " + _sessionId + ", instance: " + _instanceName
+ ", instanceTye: " + _instanceType + ", cluster: " + _clusterName + ", zkconnection: "
http://git-wip-us.apache.org/repos/asf/helix/blob/677dbf56/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index bbebf55..ce8f058 100644
--- a/pom.xml
+++ b/pom.xml
@@ -163,11 +163,6 @@ under the License.
<enabled>false</enabled>
</snapshots>
</repository>
- <repository>
- <id>Sonatype-public</id>
- <name>SnakeYAML repository</name>
- <url>http://oss.sonatype.org/content/groups/public/</url>
- </repository>
</repositories>