Fix a typo in ZkHelixManager disconnect. The issue may cause disconnect call fail unexpectedly.
Project: http://git-wip-us.apache.org/repos/asf/helix/repo Commit: http://git-wip-us.apache.org/repos/asf/helix/commit/a2de7cf1 Tree: http://git-wip-us.apache.org/repos/asf/helix/tree/a2de7cf1 Diff: http://git-wip-us.apache.org/repos/asf/helix/diff/a2de7cf1 Branch: refs/heads/master Commit: a2de7cf1ca267342180e533a0b49a38a4019f2db Parents: 8674885 Author: Jiajun Wang <[email protected]> Authored: Mon Aug 13 17:37:41 2018 -0700 Committer: Lei Xia <[email protected]> Committed: Fri Sep 21 14:14:22 2018 -0700 ---------------------------------------------------------------------- .../src/main/java/org/apache/helix/manager/zk/ZKHelixManager.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/helix/blob/a2de7cf1/helix-core/src/main/java/org/apache/helix/manager/zk/ZKHelixManager.java ---------------------------------------------------------------------- diff --git a/helix-core/src/main/java/org/apache/helix/manager/zk/ZKHelixManager.java b/helix-core/src/main/java/org/apache/helix/manager/zk/ZKHelixManager.java index 46deb44..e6fabc1 100644 --- a/helix-core/src/main/java/org/apache/helix/manager/zk/ZKHelixManager.java +++ b/helix-core/src/main/java/org/apache/helix/manager/zk/ZKHelixManager.java @@ -681,7 +681,7 @@ public class ZKHelixManager implements HelixManager, IZkStateListener { @Override public void disconnect() { - if (_zkclient == null && _zkclient.isClosed()) { + if (_zkclient == null || _zkclient.isClosed()) { LOG.info("instanceName: " + _instanceName + " already disconnected"); return; }
