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 listAllSubscribeInfo(String destination) throws CanalMetaManagerException { - if (zkClientx == null) { + if (zkClientx == null) { //重新加载时可能为空 return new ArrayList(); } String path = ZookeeperPathUtils.getDestinationPath(destination);