Repository: commons-dbcp Updated Branches: refs/heads/master ab2c8a886 -> 712a207bf
No need to set ivars to null in declarations. Project: http://git-wip-us.apache.org/repos/asf/commons-dbcp/repo Commit: http://git-wip-us.apache.org/repos/asf/commons-dbcp/commit/712a207b Tree: http://git-wip-us.apache.org/repos/asf/commons-dbcp/tree/712a207b Diff: http://git-wip-us.apache.org/repos/asf/commons-dbcp/diff/712a207b Branch: refs/heads/master Commit: 712a207bfc7ea809c112fa22c44481332a8a822d Parents: ab2c8a8 Author: Gary Gregory <garydgreg...@gmail.com> Authored: Fri Aug 18 10:00:04 2017 -0600 Committer: Gary Gregory <garydgreg...@gmail.com> Committed: Fri Aug 18 10:00:04 2017 -0600 ---------------------------------------------------------------------- .../apache/commons/dbcp2/BasicDataSource.java | 28 ++++++++++---------- 1 file changed, 14 insertions(+), 14 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/commons-dbcp/blob/712a207b/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 12314c8..11b16cc 100644 --- a/src/main/java/org/apache/commons/dbcp2/BasicDataSource.java +++ b/src/main/java/org/apache/commons/dbcp2/BasicDataSource.java @@ -107,7 +107,7 @@ public class BasicDataSource implements DataSource, BasicDataSourceMXBean, MBean /** * The default auto-commit state of connections created by this pool. */ - private volatile Boolean defaultAutoCommit = null; + private volatile Boolean defaultAutoCommit; /** * Returns the default auto-commit property. @@ -138,7 +138,7 @@ public class BasicDataSource implements DataSource, BasicDataSourceMXBean, MBean /** * The default read-only state of connections created by this pool. */ - private transient Boolean defaultReadOnly = null; + private transient Boolean defaultReadOnly; /** * Returns the default readOnly property. @@ -199,7 +199,7 @@ public class BasicDataSource implements DataSource, BasicDataSourceMXBean, MBean } - private Integer defaultQueryTimeout = null; + private Integer defaultQueryTimeout; /** * Obtain the default query timeout that will be used for {@link java.sql.Statement Statement}s @@ -224,7 +224,7 @@ public class BasicDataSource implements DataSource, BasicDataSourceMXBean, MBean /** * The default "catalog" of connections created by this pool. */ - private volatile String defaultCatalog = null; + private volatile String defaultCatalog; /** * Returns the default catalog. @@ -283,7 +283,7 @@ public class BasicDataSource implements DataSource, BasicDataSourceMXBean, MBean /** * The instance of the JDBC Driver to use. */ - private Driver driver = null; + private Driver driver; /** * Returns the JDBC Driver that has been configured for use by this pool. @@ -316,7 +316,7 @@ public class BasicDataSource implements DataSource, BasicDataSourceMXBean, MBean /** * The fully qualified Java class name of the JDBC driver to be used. */ - private String driverClassName = null; + private String driverClassName; /** * Returns the JDBC driver class name. @@ -357,7 +357,7 @@ public class BasicDataSource implements DataSource, BasicDataSourceMXBean, MBean * If specified, {@link Class#forName(String, boolean, ClassLoader)} is * used. */ - private ClassLoader driverClassLoader = null; + private ClassLoader driverClassLoader; /** * Returns the class loader specified for loading the JDBC driver. Returns @@ -1006,7 +1006,7 @@ public class BasicDataSource implements DataSource, BasicDataSourceMXBean, MBean * The connection password to be passed to our JDBC driver to establish * a connection. */ - private volatile String password = null; + private volatile String password; /** * Returns the password passed to the JDBC driver to establish connections. @@ -1036,7 +1036,7 @@ public class BasicDataSource implements DataSource, BasicDataSourceMXBean, MBean * The connection URL to be passed to our JDBC driver to establish * a connection. */ - private String url = null; + private String url; /** * Returns the JDBC connection {@link #url} property. @@ -1067,7 +1067,7 @@ public class BasicDataSource implements DataSource, BasicDataSourceMXBean, MBean * The connection username to be passed to our JDBC driver to * establish a connection. */ - private String username = null; + private String username; /** * Returns the JDBC connection {@link #username} property. @@ -1101,7 +1101,7 @@ public class BasicDataSource implements DataSource, BasicDataSourceMXBean, MBean * one row. If not specified, {@link Connection#isValid(int)} will be used * to validate connections. */ - private volatile String validationQuery = null; + private volatile String validationQuery; /** * Returns the validation query used to validate connections before @@ -1311,7 +1311,7 @@ public class BasicDataSource implements DataSource, BasicDataSourceMXBean, MBean this.logExpiredConnections = logExpiredConnections; } - private String jmxName = null; + private String jmxName; /** * Returns the JMX name that has been requested for this DataSource. If the @@ -1474,7 +1474,7 @@ public class BasicDataSource implements DataSource, BasicDataSourceMXBean, MBean /** * The object pool that internally manages our connections. */ - private volatile GenericObjectPool<PoolableConnection> connectionPool = null; + private volatile GenericObjectPool<PoolableConnection> connectionPool; protected GenericObjectPool<PoolableConnection> getConnectionPool() { return connectionPool; @@ -1498,7 +1498,7 @@ public class BasicDataSource implements DataSource, BasicDataSourceMXBean, MBean * be acquired <strong>ONLY</strong> by calls to the * <code>createDataSource()</code> method. */ - private volatile DataSource dataSource = null; + private volatile DataSource dataSource; /** * The PrintWriter to which log messages should be directed.
