You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@curator.apache.org by ca...@apache.org on 2018/04/12 01:56:03 UTC
[4/6] curator git commit: CURATOR-460 Removing unnecessary empty lines
CURATOR-460 Removing unnecessary empty lines
Project: http://git-wip-us.apache.org/repos/asf/curator/repo
Commit: http://git-wip-us.apache.org/repos/asf/curator/commit/9123e04c
Tree: http://git-wip-us.apache.org/repos/asf/curator/tree/9123e04c
Diff: http://git-wip-us.apache.org/repos/asf/curator/diff/9123e04c
Branch: refs/heads/CURATOR-460
Commit: 9123e04c2e1410877c29d3db125ebedffb9e912e
Parents: 0a5b29d
Author: javando <an...@gmail.com>
Authored: Wed Apr 4 23:17:39 2018 -0300
Committer: javando <an...@gmail.com>
Committed: Wed Apr 4 23:17:39 2018 -0300
----------------------------------------------------------------------
.../apache/curator/framework/state/ConnectionStateManager.java | 3 ---
1 file changed, 3 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/curator/blob/9123e04c/curator-framework/src/main/java/org/apache/curator/framework/state/ConnectionStateManager.java
----------------------------------------------------------------------
diff --git a/curator-framework/src/main/java/org/apache/curator/framework/state/ConnectionStateManager.java b/curator-framework/src/main/java/org/apache/curator/framework/state/ConnectionStateManager.java
index 76c5636..609bfa0 100644
--- a/curator-framework/src/main/java/org/apache/curator/framework/state/ConnectionStateManager.java
+++ b/curator-framework/src/main/java/org/apache/curator/framework/state/ConnectionStateManager.java
@@ -253,16 +253,13 @@ public class ConnectionStateManager implements Closeable
{
long localStartOfSuspendedEpoch;
-
synchronized (this) {
localStartOfSuspendedEpoch = this.startOfSuspendedEpoch;
}
-
int lastNegotiatedSessionTimeoutMs = client.getZookeeperClient().getLastNegotiatedSessionTimeoutMs();
int useSessionTimeoutMs = (lastNegotiatedSessionTimeoutMs > 0) ? lastNegotiatedSessionTimeoutMs : sessionTimeoutMs;
useSessionTimeoutMs = sessionExpirationPercent > 0 && localStartOfSuspendedEpoch != 0 ? (useSessionTimeoutMs * sessionExpirationPercent) / 100 : useSessionTimeoutMs;
long elapsedMs = localStartOfSuspendedEpoch == 0 ? useSessionTimeoutMs / 2 : System.currentTimeMillis() - localStartOfSuspendedEpoch;
-
long pollMaxMs = useSessionTimeoutMs - elapsedMs;
final ConnectionState newState = eventQueue.poll(pollMaxMs, TimeUnit.MILLISECONDS);