rename property
Project: http://git-wip-us.apache.org/repos/asf/curator/repo Commit: http://git-wip-us.apache.org/repos/asf/curator/commit/633db98c Tree: http://git-wip-us.apache.org/repos/asf/curator/tree/633db98c Diff: http://git-wip-us.apache.org/repos/asf/curator/diff/633db98c Branch: refs/heads/master Commit: 633db98c4f0b35f532dbee4f16575449ced9f2cb Parents: aec1347 Author: Enrico Olivelli <[email protected]> Authored: Sun Jun 24 18:14:23 2018 +0200 Committer: Enrico Olivelli <[email protected]> Committed: Sun Jun 24 18:14:23 2018 +0200 ---------------------------------------------------------------------- .../main/java/org/apache/curator/CuratorZookeeperClient.java | 8 ++++---- .../apache/curator/framework/CuratorFrameworkFactory.java | 8 ++++---- .../apache/curator/framework/imps/CuratorFrameworkImpl.java | 2 +- 3 files changed, 9 insertions(+), 9 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/curator/blob/633db98c/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 065743b..1981c90 100644 --- a/curator-client/src/main/java/org/apache/curator/CuratorZookeeperClient.java +++ b/curator-client/src/main/java/org/apache/curator/CuratorZookeeperClient.java @@ -52,7 +52,7 @@ public class CuratorZookeeperClient implements Closeable private final ConnectionState state; private final AtomicReference<RetryPolicy> retryPolicy = new AtomicReference<RetryPolicy>(); private final int connectionTimeoutMs; - private final int defaultWaitForShutdownTimeoutMs; + private final int waitForShutdownTimeoutMs; private final AtomicBoolean started = new AtomicBoolean(false); private final AtomicReference<TracerDriver> tracer = new AtomicReference<TracerDriver>(new DefaultTracerDriver()); private final ConnectionHandlingPolicy connectionHandlingPolicy; @@ -146,7 +146,7 @@ public class CuratorZookeeperClient implements Closeable ensembleProvider = Preconditions.checkNotNull(ensembleProvider, "ensembleProvider cannot be null"); this.connectionTimeoutMs = connectionTimeoutMs; - this.defaultWaitForShutdownTimeoutMs = defaultWaitForShutdownTimeoutMs; + this.waitForShutdownTimeoutMs = defaultWaitForShutdownTimeoutMs; state = new ConnectionState(zookeeperFactory, ensembleProvider, sessionTimeoutMs, connectionTimeoutMs, watcher, tracer, canBeReadOnly, connectionHandlingPolicy); setRetryPolicy(retryPolicy); } @@ -240,13 +240,13 @@ public class CuratorZookeeperClient implements Closeable /** * Close the client. * - * Same as {@link #close(int) } using the default timeout set at construction time. + * Same as {@link #close(int) } using the timeout set at construction time. * * @see #close(int) */ @Override public void close() { - close(defaultWaitForShutdownTimeoutMs); + close(waitForShutdownTimeoutMs); } /** http://git-wip-us.apache.org/repos/asf/curator/blob/633db98c/curator-framework/src/main/java/org/apache/curator/framework/CuratorFrameworkFactory.java ---------------------------------------------------------------------- diff --git a/curator-framework/src/main/java/org/apache/curator/framework/CuratorFrameworkFactory.java b/curator-framework/src/main/java/org/apache/curator/framework/CuratorFrameworkFactory.java index dad164e..c1615c5 100644 --- a/curator-framework/src/main/java/org/apache/curator/framework/CuratorFrameworkFactory.java +++ b/curator-framework/src/main/java/org/apache/curator/framework/CuratorFrameworkFactory.java @@ -148,7 +148,7 @@ public class CuratorFrameworkFactory private ConnectionHandlingPolicy connectionHandlingPolicy = new StandardConnectionHandlingPolicy(); private SchemaSet schemaSet = SchemaSet.getDefaultSchemaSet(); private boolean zk34CompatibilityMode = isZK34(); - private int defaultWaitForShutdownTimeoutMs = 0; + private int waitForShutdownTimeoutMs = 0; /** * Apply the current values and build a new CuratorFramework * @@ -412,7 +412,7 @@ public class CuratorFrameworkFactory */ public Builder defaultWaitForShutdownTimeoutMs(int defaultWaitForShutdownTimeoutMs) { - this.defaultWaitForShutdownTimeoutMs = defaultWaitForShutdownTimeoutMs; + this.waitForShutdownTimeoutMs = defaultWaitForShutdownTimeoutMs; return this; } @@ -509,9 +509,9 @@ public class CuratorFrameworkFactory return connectionTimeoutMs; } - public int getDefaultWaitForShutdownTimeoutMs() + public int getWaitForShutdownTimeoutMs() { - return defaultWaitForShutdownTimeoutMs; + return waitForShutdownTimeoutMs; } public int getMaxCloseWaitMs() http://git-wip-us.apache.org/repos/asf/curator/blob/633db98c/curator-framework/src/main/java/org/apache/curator/framework/imps/CuratorFrameworkImpl.java ---------------------------------------------------------------------- diff --git a/curator-framework/src/main/java/org/apache/curator/framework/imps/CuratorFrameworkImpl.java b/curator-framework/src/main/java/org/apache/curator/framework/imps/CuratorFrameworkImpl.java index 80a7b56..63809ff 100644 --- a/curator-framework/src/main/java/org/apache/curator/framework/imps/CuratorFrameworkImpl.java +++ b/curator-framework/src/main/java/org/apache/curator/framework/imps/CuratorFrameworkImpl.java @@ -122,7 +122,7 @@ public class CuratorFrameworkImpl implements CuratorFramework builder.getEnsembleProvider(), builder.getSessionTimeoutMs(), builder.getConnectionTimeoutMs(), - builder.getDefaultWaitForShutdownTimeoutMs(), + builder.getWaitForShutdownTimeoutMs(), new Watcher() { @Override
