Merge pull request apache#1792, fix zk unsubscribe issue.

nzomkxia · chickenlj · commit ba447eb93f47 · 2018-05-17T11:51:17.000+08:00
diff --git a/dubbo-registry/dubbo-registry-zookeeper/src/main/java/com/alibaba/dubbo/registry/zookeeper/ZookeeperRegistry.java b/dubbo-registry/dubbo-registry-zookeeper/src/main/java/com/alibaba/dubbo/registry/zookeeper/ZookeeperRegistry.java
@@ -200,7 +200,14 @@ protected void doUnsubscribe(URL url, NotifyListener listener) {
         if (listeners != null) {
             ChildListener zkListener = listeners.get(listener);
             if (zkListener != null) {
-                zkClient.removeChildListener(toUrlPath(url), zkListener);
+                if (Constants.ANY_VALUE.equals(url.getServiceInterface())) {
+                    String root = toRootPath();
+                    zkClient.removeChildListener(root, zkListener);
+                } else {
+                    for (String path : toCategoriesPath(url)) {
+                        zkClient.removeChildListener(path, zkListener);
+                    }
+                }
             }
         }
     }

Original file line number	Diff line number	Diff line change
`@@ -200,7 +200,14 @@ protected void doUnsubscribe(URL url, NotifyListener listener) {`
`200`	`200`	`if (listeners != null) {`
`201`	`201`	`ChildListener zkListener = listeners.get(listener);`
`202`	`202`	`if (zkListener != null) {`
`203`		`- zkClient.removeChildListener(toUrlPath(url), zkListener);`
	`203`	`+ if (Constants.ANY_VALUE.equals(url.getServiceInterface())) {`
	`204`	`+ String root = toRootPath();`
	`205`	`+ zkClient.removeChildListener(root, zkListener);`
	`206`	`+ } else {`
	`207`	`+ for (String path : toCategoriesPath(url)) {`
	`208`	`+ zkClient.removeChildListener(path, zkListener);`
	`209`	`+ }`
	`210`	`+ }`
`204`	`211`	`}`
`205`	`212`	`}`
`206`	`213`	`}`