natas_hw
/
dubbo
0
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

DUBBO-155 将root节点延迟到register时创建，避免启动时在ZookeeperRegistry构造函数出现异常，并吃掉zookeeper.exists()异常，返回false，避免在if条件中抛出异常，改由create()抛出异常。 

git-svn-id: http://code.alibabatech.com/svn/dubbo/trunk@727 1a56cb94-b969-4eaa-88fa-be21384802f2
This commit is contained in:
william.liangf 2011-12-26 08:22:33 +00:00
parent 9e1ba39cca
commit 322af96bc8
1 changed files with 19 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
dubbo-registry-zookeeper/src/main/java/com/alibaba/dubbo/registry/zookeeper/ZookeeperRegistry.java
View File

@ -244,12 +244,6 @@ public class ZookeeperRegistry extends FailbackRegistry {
if (auth) {
zk.addAuthInfo(url.getUsername(), url.getPassword().getBytes());
}
if (root != null && root.length() > 0 && zk.exists(root, false) == null) {
try {
zk.create(root, new byte[0], acl, CreateMode.PERSISTENT);
} catch (NodeExistsException e) {
}
}
return zk;
}
@ -266,24 +260,40 @@ public class ZookeeperRegistry extends FailbackRegistry {
}
}
private boolean exists(String node) {
try {
return zookeeper.exists(root, false) != null;
} catch (Throwable e) {
return false;
}
}
protected void doRegister(URL url) {
try {
String root = toRootPath();
if (root != null && root.length() > 0 && ! SEPARATOR.equals(root)
&& ! exists(root)) {
try {
zookeeper.create(root, new byte[0], acl, CreateMode.PERSISTENT);
} catch (NodeExistsException e) {
}
}
String service = toServicePath(url);
if (zookeeper.exists(service, false) == null) {
if (! exists(service)) {
try {
zookeeper.create(service, new byte[0], acl, CreateMode.PERSISTENT);
} catch (NodeExistsException e) {
}
}
String category = toCategoryPath(url);
if (zookeeper.exists(category, false) == null) {
if (! exists(category)) {
try {
zookeeper.create(category, new byte[0], acl, CreateMode.PERSISTENT);
} catch (NodeExistsException e) {
}
}
String provider = toProviderPath(url);
if (zookeeper.exists(provider, false) != null) {
if (exists(provider)) {
try {
zookeeper.delete(provider, -1);
} catch (NoNodeException e) {