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

修改zookeeper会话过期重连 

git-svn-id: http://code.alibabatech.com/svn/dubbo/trunk@219 1a56cb94-b969-4eaa-88fa-be21384802f2
This commit is contained in:
william.liangf 2011-11-09 10:38:54 +00:00
parent 32a21a1e66
commit d282736811
1 changed files with 7 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -69,23 +69,23 @@ public class ZookeeperRegistry extends FailbackRegistry {
} else {
this.root = "";
}
initZookeeper(url);
initZookeeper();
}
@Override
protected void doRetry() {
ZooKeeper zk = this.zookeeper;
if (zk == null || zk.getState() == null || ! zk.getState().isAlive()) {
initZookeeper(getUrl());
initZookeeper();
}
}
private void initZookeeper(final URL url) {
private void initZookeeper() {
zookeeperLock.lock();
try {
ZooKeeper zk = this.zookeeper;
if (zk == null || zk.getState() == null || ! zk.getState().isAlive()) {
this.zookeeper = createZookeeper(url);
this.zookeeper = createZookeeper();
}
if (zk != null) {
zk.close();
@ -97,7 +97,8 @@ public class ZookeeperRegistry extends FailbackRegistry {
}
}
private ZooKeeper createZookeeper(final URL url) throws Exception {
private ZooKeeper createZookeeper() throws Exception {
URL url = getUrl();
String address = url.getAddress();
String backup = url.getParameter(Constants.BACKUP_KEY);
if (backup != null && backup.length() > 0) {
@ -108,7 +109,7 @@ public class ZookeeperRegistry extends FailbackRegistry {
public void process(WatchedEvent event) {
try {
if (event.getState() == KeeperState.Expired) {
initZookeeper(url);
initZookeeper();
}
if (event.getType() != EventType.NodeChildrenChanged) {
return;