Ver código fonte

Merge pull request #32 from alibaba/master

merge
rewerma 6 anos atrás
pai
commit
ff1fef1eb6

+ 2 - 2
common/src/main/java/com/alibaba/otter/canal/common/zookeeper/ZkClientx.java

@@ -34,8 +34,8 @@ public class ZkClientx extends ZkClient {
         return clients.get(servers);
         return clients.get(servers);
     }
     }
 
 
-    public static ZkClientx removeZkClient(String servers) {
-        return clients.remove(servers);
+    public static void clearClients() {
+        clients.clear();
     }
     }
 
 
     public ZkClientx(String serverstring){
     public ZkClientx(String serverstring){

+ 2 - 0
deployer/src/main/java/com/alibaba/otter/canal/deployer/CanalController.java

@@ -522,6 +522,8 @@ public class CanalController {
         if (instanceConfigMonitors != null) {
         if (instanceConfigMonitors != null) {
             instanceConfigMonitors.clear();
             instanceConfigMonitors.clear();
         }
         }
+
+        ZkClientx.clearClients();
     }
     }
 
 
     private void initCid(String path) {
     private void initCid(String path) {