From 2d88d803ee46a6412ded38b74ff72bad97ece05e Mon Sep 17 00:00:00 2001 From: mcy Date: Thu, 17 Jan 2019 10:52:27 +0800 Subject: [PATCH] merge #1440 and fixed #1430 --- .../com/alibaba/otter/canal/deployer/CanalController.java | 5 ----- 1 file changed, 5 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 27d21164..bc58e9f7 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 @@ -68,7 +68,6 @@ public class CanalController { private CanalInstanceGenerator instanceGenerator; private ZkClientx zkclientx; - private String zkServers; private CanalMQStarter canalMQStarter; @@ -133,7 +132,6 @@ public class CanalController { } final String zkServers = getProperty(properties, CanalConstants.CANAL_ZKSERVERS); if (StringUtils.isNotEmpty(zkServers)) { - this.zkServers = zkServers; zkclientx = ZkClientx.getZkClient(zkServers); // 初始化系统目录 zkclientx.createPersistent(ZookeeperPathUtils.DESTINATION_ROOT_NODE, true); @@ -508,9 +506,6 @@ public class CanalController { if (zkclientx != null) { zkclientx.close(); - if (zkServers != null) { - ZkClientx.removeZkClient(zkServers); - } } if (instanceConfigs != null) {