You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@helix.apache.org by ka...@apache.org on 2014/11/19 05:42:35 UTC
[4/4] helix git commit: [HELIX-550] ZKHelixManager should shutdown
GenericHelixController, minor fix
[HELIX-550] ZKHelixManager should shutdown GenericHelixController, minor fix
Project: http://git-wip-us.apache.org/repos/asf/helix/repo
Commit: http://git-wip-us.apache.org/repos/asf/helix/commit/45a9fd3a
Tree: http://git-wip-us.apache.org/repos/asf/helix/tree/45a9fd3a
Diff: http://git-wip-us.apache.org/repos/asf/helix/diff/45a9fd3a
Branch: refs/heads/helix-0.6.x
Commit: 45a9fd3a960f6bb7b32c3135fb692ab23e8dc5a7
Parents: c85cf82
Author: Kanak Biscuitwala <ka...@hotmail.com>
Authored: Tue Nov 18 20:41:20 2014 -0800
Committer: Kanak Biscuitwala <ka...@hotmail.com>
Committed: Tue Nov 18 20:41:20 2014 -0800
----------------------------------------------------------------------
.../src/main/java/org/apache/helix/manager/zk/ZKHelixManager.java | 3 +--
1 file changed, 1 insertion(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/helix/blob/45a9fd3a/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 2c19396..6a1fb72 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
@@ -560,8 +560,7 @@ public class ZKHelixManager implements HelixManager, IZkStateListener {
_controller.shutdown();
} catch (InterruptedException e) {
LOG.info("Interrupted shutting down GenericHelixController", e);
- }
- finally {
+ } finally {
_controller = null;
_leaderElectionHandler = null;
}