You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@curator.apache.org by ra...@apache.org on 2018/06/28 06:03:53 UTC
[10/14] curator git commit: last rename
last rename
Project: http://git-wip-us.apache.org/repos/asf/curator/repo
Commit: http://git-wip-us.apache.org/repos/asf/curator/commit/d1d00bc7
Tree: http://git-wip-us.apache.org/repos/asf/curator/tree/d1d00bc7
Diff: http://git-wip-us.apache.org/repos/asf/curator/diff/d1d00bc7
Branch: refs/heads/master
Commit: d1d00bc7e1cf7f6253c3ce5cb0031ae22791bbf3
Parents: f686ec9
Author: Enrico Olivelli <eo...@apache.org>
Authored: Sun Jun 24 18:18:31 2018 +0200
Committer: Enrico Olivelli <eo...@apache.org>
Committed: Sun Jun 24 18:18:31 2018 +0200
----------------------------------------------------------------------
.../main/java/org/apache/curator/CuratorZookeeperClient.java | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/curator/blob/d1d00bc7/curator-client/src/main/java/org/apache/curator/CuratorZookeeperClient.java
----------------------------------------------------------------------
diff --git a/curator-client/src/main/java/org/apache/curator/CuratorZookeeperClient.java b/curator-client/src/main/java/org/apache/curator/CuratorZookeeperClient.java
index 1981c90..5032117 100644
--- a/curator-client/src/main/java/org/apache/curator/CuratorZookeeperClient.java
+++ b/curator-client/src/main/java/org/apache/curator/CuratorZookeeperClient.java
@@ -122,7 +122,7 @@ public class CuratorZookeeperClient implements Closeable
* @param ensembleProvider the ensemble provider
* @param sessionTimeoutMs session timeout
* @param connectionTimeoutMs connection timeout
- * @param defaultWaitForShutdownTimeoutMs default timeout fo close operation
+ * @param waitForShutdownTimeoutMs default timeout fo close operation
* @param watcher default watcher or null
* @param retryPolicy the retry policy to use
* @param canBeReadOnly if true, allow ZooKeeper client to enter
@@ -133,7 +133,7 @@ public class CuratorZookeeperClient implements Closeable
* @since 4.0.2
*/
public CuratorZookeeperClient(ZookeeperFactory zookeeperFactory, EnsembleProvider ensembleProvider,
- int sessionTimeoutMs, int connectionTimeoutMs, int defaultWaitForShutdownTimeoutMs, Watcher watcher,
+ int sessionTimeoutMs, int connectionTimeoutMs, int waitForShutdownTimeoutMs, Watcher watcher,
RetryPolicy retryPolicy, boolean canBeReadOnly, ConnectionHandlingPolicy connectionHandlingPolicy)
{
this.connectionHandlingPolicy = connectionHandlingPolicy;
@@ -146,7 +146,7 @@ public class CuratorZookeeperClient implements Closeable
ensembleProvider = Preconditions.checkNotNull(ensembleProvider, "ensembleProvider cannot be null");
this.connectionTimeoutMs = connectionTimeoutMs;
- this.waitForShutdownTimeoutMs = defaultWaitForShutdownTimeoutMs;
+ this.waitForShutdownTimeoutMs = waitForShutdownTimeoutMs;
state = new ConnectionState(zookeeperFactory, ensembleProvider, sessionTimeoutMs, connectionTimeoutMs, watcher, tracer, canBeReadOnly, connectionHandlingPolicy);
setRetryPolicy(retryPolicy);
}