From d28273681182b6fe2732d8c0ca94c04db18a85de Mon Sep 17 00:00:00 2001
From: "william.liangf" <william.liangf@1a56cb94-b969-4eaa-88fa-be21384802f2>
Date: Wed, 9 Nov 2011 10:38:54 +0000
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9zookeeper=E4=BC=9A=E8=AF=9D?=
 =?UTF-8?q?=E8=BF=87=E6=9C=9F=E9=87=8D=E8=BF=9E?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

git-svn-id: http://code.alibabatech.com/svn/dubbo/trunk@219 1a56cb94-b969-4eaa-88fa-be21384802f2
---
 .../dubbo/registry/zookeeper/ZookeeperRegistry.java | 13 +++++++------
 1 file changed, 7 insertions(+), 6 deletions(-)

diff --git a/dubbo-registry-zookeeper/src/main/java/com/alibaba/dubbo/registry/zookeeper/ZookeeperRegistry.java b/dubbo-registry-zookeeper/src/main/java/com/alibaba/dubbo/registry/zookeeper/ZookeeperRegistry.java
index 6dbffcd60f..c83fcfa63c 100644
--- a/dubbo-registry-zookeeper/src/main/java/com/alibaba/dubbo/registry/zookeeper/ZookeeperRegistry.java
+++ b/dubbo-registry-zookeeper/src/main/java/com/alibaba/dubbo/registry/zookeeper/ZookeeperRegistry.java
@@ -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;