Repository: commons-dbcp Updated Branches: refs/heads/master e27d6a7dd -> 62e139bfb
Javadoc the scale of the query timeout as seconds. Update private ivar names to make this clear. Project: http://git-wip-us.apache.org/repos/asf/commons-dbcp/repo Commit: http://git-wip-us.apache.org/repos/asf/commons-dbcp/commit/62e139bf Tree: http://git-wip-us.apache.org/repos/asf/commons-dbcp/tree/62e139bf Diff: http://git-wip-us.apache.org/repos/asf/commons-dbcp/diff/62e139bf Branch: refs/heads/master Commit: 62e139bfbcbb1c70bd622081932b133d09aa4a62 Parents: e27d6a7 Author: Gary Gregory <garydgreg...@gmail.com> Authored: Sun Jun 10 10:01:11 2018 -0600 Committer: Gary Gregory <garydgreg...@gmail.com> Committed: Sun Jun 10 10:01:11 2018 -0600 ---------------------------------------------------------------------- .../apache/commons/dbcp2/BasicDataSource.java | 14 ++++---- .../commons/dbcp2/DelegatingConnection.java | 37 +++++++++++--------- .../dbcp2/PoolableConnectionFactory.java | 10 +++--- 3 files changed, 32 insertions(+), 29 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/commons-dbcp/blob/62e139bf/src/main/java/org/apache/commons/dbcp2/BasicDataSource.java ---------------------------------------------------------------------- diff --git a/src/main/java/org/apache/commons/dbcp2/BasicDataSource.java b/src/main/java/org/apache/commons/dbcp2/BasicDataSource.java index 363183c..c5bbe1d 100644 --- a/src/main/java/org/apache/commons/dbcp2/BasicDataSource.java +++ b/src/main/java/org/apache/commons/dbcp2/BasicDataSource.java @@ -201,16 +201,16 @@ public class BasicDataSource implements DataSource, BasicDataSourceMXBean, MBean } - private Integer defaultQueryTimeout; + private Integer defaultQueryTimeoutSeconds; /** * Gets the default query timeout that will be used for {@link java.sql.Statement Statement}s created from this * connection. <code>null</code> means that the driver default will be used. * - * @return The default query timeout + * @return The default query timeout in seconds. */ public Integer getDefaultQueryTimeout() { - return defaultQueryTimeout; + return defaultQueryTimeoutSeconds; } @@ -218,11 +218,11 @@ public class BasicDataSource implements DataSource, BasicDataSourceMXBean, MBean * Sets the default query timeout that will be used for {@link java.sql.Statement Statement}s created from this * connection. <code>null</code> means that the driver default will be used. * - * @param defaultQueryTimeout - * The default query timeout. + * @param defaultQueryTimeoutSeconds + * The default query timeout in seconds. */ - public void setDefaultQueryTimeout(final Integer defaultQueryTimeout) { - this.defaultQueryTimeout = defaultQueryTimeout; + public void setDefaultQueryTimeout(final Integer defaultQueryTimeoutSeconds) { + this.defaultQueryTimeoutSeconds = defaultQueryTimeoutSeconds; } http://git-wip-us.apache.org/repos/asf/commons-dbcp/blob/62e139bf/src/main/java/org/apache/commons/dbcp2/DelegatingConnection.java ---------------------------------------------------------------------- diff --git a/src/main/java/org/apache/commons/dbcp2/DelegatingConnection.java b/src/main/java/org/apache/commons/dbcp2/DelegatingConnection.java index 49dfd44..9f5508a 100644 --- a/src/main/java/org/apache/commons/dbcp2/DelegatingConnection.java +++ b/src/main/java/org/apache/commons/dbcp2/DelegatingConnection.java @@ -71,14 +71,14 @@ public class DelegatingConnection<C extends Connection> extends AbandonedTrace Collections.<String, ClientInfoStatus>emptyMap(); /** My delegate {@link Connection}. */ - private volatile C _conn = null; + private volatile C _conn; - private volatile boolean _closed = false; + private volatile boolean _closed; private boolean _cacheState = true; - private Boolean _autoCommitCached = null; - private Boolean _readOnlyCached = null; - private Integer defaultQueryTimeout = null; + private Boolean _autoCommitCached; + private Boolean _readOnlyCached; + private Integer defaultQueryTimeoutSeconds; /** * Create a wrapper for the Connection which traces this @@ -247,9 +247,9 @@ public class DelegatingConnection<C extends Connection> extends AbandonedTrace } private void initializeStatement(final DelegatingStatement ds) throws SQLException { - if (defaultQueryTimeout != null && - defaultQueryTimeout.intValue() != ds.getQueryTimeout()) { - ds.setQueryTimeout(defaultQueryTimeout.intValue()); + if (defaultQueryTimeoutSeconds != null && + defaultQueryTimeoutSeconds.intValue() != ds.getQueryTimeout()) { + ds.setQueryTimeout(defaultQueryTimeoutSeconds.intValue()); } } @@ -496,22 +496,25 @@ public class DelegatingConnection<C extends Connection> extends AbandonedTrace /** - * Obtain the default query timeout that will be used for {@link Statement}s - * created from this connection. <code>null</code> means that the driver - * default will be used. + * Gets the default query timeout that will be used for {@link Statement}s created from this connection. + * <code>null</code> means that the driver default will be used. + * + * @return query timeout limit in seconds; zero means there is no limit */ public Integer getDefaultQueryTimeout() { - return defaultQueryTimeout; + return defaultQueryTimeoutSeconds; } /** - * Set the default query timeout that will be used for {@link Statement}s - * created from this connection. <code>null</code> means that the driver - * default will be used. + * Sets the default query timeout that will be used for {@link Statement}s created from this connection. + * <code>null</code> means that the driver default will be used. + * + * @param defaultQueryTimeoutSeconds + * the new query timeout limit in seconds; zero means there is no limit */ - public void setDefaultQueryTimeout(final Integer defaultQueryTimeout) { - this.defaultQueryTimeout = defaultQueryTimeout; + public void setDefaultQueryTimeout(final Integer defaultQueryTimeoutSeconds) { + this.defaultQueryTimeoutSeconds = defaultQueryTimeoutSeconds; } http://git-wip-us.apache.org/repos/asf/commons-dbcp/blob/62e139bf/src/main/java/org/apache/commons/dbcp2/PoolableConnectionFactory.java ---------------------------------------------------------------------- diff --git a/src/main/java/org/apache/commons/dbcp2/PoolableConnectionFactory.java b/src/main/java/org/apache/commons/dbcp2/PoolableConnectionFactory.java index 6c6d8fc..791f953 100644 --- a/src/main/java/org/apache/commons/dbcp2/PoolableConnectionFactory.java +++ b/src/main/java/org/apache/commons/dbcp2/PoolableConnectionFactory.java @@ -195,11 +195,11 @@ public class PoolableConnectionFactory } public Integer getDefaultQueryTimeout() { - return defaultQueryTimeout; + return defaultQueryTimeoutSeconds; } - public void setDefaultQueryTimeout(final Integer defaultQueryTimeout) { - this.defaultQueryTimeout = defaultQueryTimeout; + public void setDefaultQueryTimeout(final Integer defaultQueryTimeoutSeconds) { + this.defaultQueryTimeoutSeconds = defaultQueryTimeoutSeconds; } /** @@ -418,7 +418,7 @@ public class PoolableConnectionFactory !_defaultCatalog.equals(conn.getCatalog())) { conn.setCatalog(_defaultCatalog); } - conn.setDefaultQueryTimeout(defaultQueryTimeout); + conn.setDefaultQueryTimeout(defaultQueryTimeoutSeconds); } private void validateLifetime(final PooledObject<PoolableConnection> p) @@ -478,7 +478,7 @@ public class PoolableConnectionFactory GenericKeyedObjectPoolConfig.DEFAULT_MAX_TOTAL_PER_KEY; private long maxConnLifetimeMillis = -1; private final AtomicLong connectionIndex = new AtomicLong(0); - private Integer defaultQueryTimeout = null; + private Integer defaultQueryTimeoutSeconds; /** * Internal constant to indicate the level is not set.
