From ba9d9dea6d846b97e052b4dc071ac58e49017088 Mon Sep 17 00:00:00 2001
From: mcy <rewerma@163.com>
Date: Thu, 17 Jan 2019 11:27:12 +0800
Subject: [PATCH] fixed #1433

---
 .../com/alibaba/otter/canal/deployer/CanalController.java     | 1 +
 .../com/alibaba/otter/canal/meta/ZooKeeperMetaManager.java    | 4 ++--
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/deployer/src/main/java/com/alibaba/otter/canal/deployer/CanalController.java b/deployer/src/main/java/com/alibaba/otter/canal/deployer/CanalController.java
index bc58e9f7..d8ca17fd 100644
--- a/deployer/src/main/java/com/alibaba/otter/canal/deployer/CanalController.java
+++ b/deployer/src/main/java/com/alibaba/otter/canal/deployer/CanalController.java
@@ -508,6 +508,7 @@ public class CanalController {
             zkclientx.close();
         }
 
+        //关闭时清理缓存
         if (instanceConfigs != null) {
             instanceConfigs.clear();
         }
diff --git a/meta/src/main/java/com/alibaba/otter/canal/meta/ZooKeeperMetaManager.java b/meta/src/main/java/com/alibaba/otter/canal/meta/ZooKeeperMetaManager.java
index 357f1293..2e3fdde5 100644
--- a/meta/src/main/java/com/alibaba/otter/canal/meta/ZooKeeperMetaManager.java
+++ b/meta/src/main/java/com/alibaba/otter/canal/meta/ZooKeeperMetaManager.java
@@ -56,7 +56,7 @@ public class ZooKeeperMetaManager extends AbstractCanalLifeCycle implements Cana
     }
 
     public void stop() {
-        zkClientx = null;
+        zkClientx = null; //关闭时置空
         super.stop();
     }
 
@@ -102,7 +102,7 @@ public class ZooKeeperMetaManager extends AbstractCanalLifeCycle implements Cana
     }
 
     public List<ClientIdentity> listAllSubscribeInfo(String destination) throws CanalMetaManagerException {
-        if (zkClientx == null) {
+        if (zkClientx == null) { //重新加载时可能为空
             return new ArrayList<ClientIdentity>();
         }
         String path = ZookeeperPathUtils.getDestinationPath(destination);