Updated Branches: refs/heads/master 2194542fa -> 2904c8369
[HELIX-321] Controller forgets that it's the leader, rb=15817 Project: http://git-wip-us.apache.org/repos/asf/incubator-helix/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-helix/commit/bac40bbf Tree: http://git-wip-us.apache.org/repos/asf/incubator-helix/tree/bac40bbf Diff: http://git-wip-us.apache.org/repos/asf/incubator-helix/diff/bac40bbf Branch: refs/heads/master Commit: bac40bbfb113070997475f706144768d7e6744c6 Parents: d09de23 Author: Kanak Biscuitwala <[email protected]> Authored: Fri Nov 22 17:42:13 2013 -0800 Committer: Kanak Biscuitwala <[email protected]> Committed: Mon Nov 25 09:32:43 2013 -0800 ---------------------------------------------------------------------- .../java/org/apache/helix/manager/zk/HelixConnectionAdaptor.java | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-helix/blob/bac40bbf/helix-core/src/main/java/org/apache/helix/manager/zk/HelixConnectionAdaptor.java ---------------------------------------------------------------------- diff --git a/helix-core/src/main/java/org/apache/helix/manager/zk/HelixConnectionAdaptor.java b/helix-core/src/main/java/org/apache/helix/manager/zk/HelixConnectionAdaptor.java index ecafbc8..e52427c 100644 --- a/helix-core/src/main/java/org/apache/helix/manager/zk/HelixConnectionAdaptor.java +++ b/helix-core/src/main/java/org/apache/helix/manager/zk/HelixConnectionAdaptor.java @@ -69,12 +69,10 @@ public class HelixConnectionAdaptor implements HelixManager { final InstanceType _instanceType; final HelixDataAccessor _accessor; final ClusterMessagingService _messagingService; - final SessionId _sessionId; public HelixConnectionAdaptor(HelixRole role) { _role = role; _connection = role.getConnection(); - _sessionId = _connection.getSessionId(); _clusterId = role.getClusterId(); _accessor = _connection.createDataAccessor(_clusterId); @@ -181,7 +179,7 @@ public class HelixConnectionAdaptor implements HelixManager { @Override public String getSessionId() { - return _sessionId.stringify(); + return _connection.getSessionId().stringify(); } @Override
