Repository: commons-dbcp Updated Branches: refs/heads/master c96a7ad5a -> 487523a34
Better variable names. Project: http://git-wip-us.apache.org/repos/asf/commons-dbcp/repo Commit: http://git-wip-us.apache.org/repos/asf/commons-dbcp/commit/487523a3 Tree: http://git-wip-us.apache.org/repos/asf/commons-dbcp/tree/487523a3 Diff: http://git-wip-us.apache.org/repos/asf/commons-dbcp/diff/487523a3 Branch: refs/heads/master Commit: 487523a34d2930dd5367963467184314f8cd0199 Parents: c96a7ad Author: Gary Gregory <ggreg...@apache.org> Authored: Tue Jan 16 13:34:41 2018 -0700 Committer: Gary Gregory <ggreg...@apache.org> Committed: Tue Jan 16 13:34:41 2018 -0700 ---------------------------------------------------------------------- .../apache/commons/dbcp2/BasicDataSource.java | 32 ++++++++++---------- .../dbcp2/PoolableConnectionFactory.java | 4 +-- 2 files changed, 18 insertions(+), 18 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/commons-dbcp/blob/487523a3/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 d533fd7..67a0fc4 100644 --- a/src/main/java/org/apache/commons/dbcp2/BasicDataSource.java +++ b/src/main/java/org/apache/commons/dbcp2/BasicDataSource.java @@ -1935,16 +1935,16 @@ public class BasicDataSource implements DataSource, BasicDataSourceMXBean, MBean */ @Override public synchronized void close() throws SQLException { - if (registeredJmxName != null) { + if (registeredJmxObjectName != null) { final MBeanServer mbs = ManagementFactory.getPlatformMBeanServer(); - if (mbs.isRegistered(registeredJmxName)) { + if (mbs.isRegistered(registeredJmxObjectName)) { try { - mbs.unregisterMBean(registeredJmxName); + mbs.unregisterMBean(registeredJmxObjectName); } catch (final JMException e) { - log.warn("Failed to unregister the JMX name: " + registeredJmxName, e); + log.warn("Failed to unregister the JMX name: " + registeredJmxObjectName, e); } } - registeredJmxName = null; + registeredJmxObjectName = null; } closed = true; final GenericObjectPool<?> oldpool = connectionPool; @@ -2214,7 +2214,7 @@ public class BasicDataSource implements DataSource, BasicDataSourceMXBean, MBean // Create an object pool to contain our active connections final GenericObjectPoolConfig config = new GenericObjectPoolConfig(); updateJmxName(config); - config.setJmxEnabled(registeredJmxName != null); // Disable JMX on the underlying pool if the DS is not registered. + config.setJmxEnabled(registeredJmxObjectName != null); // Disable JMX on the underlying pool if the DS is not registered. final GenericObjectPool<PoolableConnection> gop = createObjectPool(factory, config, abandonedConfig); gop.setMaxTotal(maxTotal); gop.setMaxIdle(maxIdle); @@ -2304,7 +2304,7 @@ public class BasicDataSource implements DataSource, BasicDataSourceMXBean, MBean final ConnectionFactory driverConnectionFactory) throws SQLException { PoolableConnectionFactory connectionFactory = null; try { - connectionFactory = new PoolableConnectionFactory(driverConnectionFactory, registeredJmxName); + connectionFactory = new PoolableConnectionFactory(driverConnectionFactory, registeredJmxObjectName); connectionFactory.setValidationQuery(validationQuery); connectionFactory.setValidationQueryTimeout(validationQueryTimeout); connectionFactory.setConnectionInitSql(connectionInitSqls); @@ -2357,11 +2357,11 @@ public class BasicDataSource implements DataSource, BasicDataSourceMXBean, MBean /** * Actual name under which this component has been registered. */ - private ObjectName registeredJmxName = null; + private ObjectName registeredJmxObjectName = null; private void jmxRegister() { // Return immediately if this DataSource has already been registered - if (registeredJmxName != null) { + if (registeredJmxObjectName != null) { return; } // Return immediately if no JMX name has been specified @@ -2392,16 +2392,16 @@ public class BasicDataSource implements DataSource, BasicDataSourceMXBean, MBean final String requestedName = getJmxName(); if (requestedName != null) { try { - registeredJmxName = new ObjectName(requestedName); + registeredJmxObjectName = new ObjectName(requestedName); } catch (final MalformedObjectNameException e) { log.warn("The requested JMX name [" + requestedName + "] was not valid and will be ignored."); } } - if (registeredJmxName == null) { - registeredJmxName = name; + if (registeredJmxObjectName == null) { + registeredJmxObjectName = name; } - return registeredJmxName; + return registeredJmxObjectName; } @Override @@ -2420,17 +2420,17 @@ public class BasicDataSource implements DataSource, BasicDataSourceMXBean, MBean } private void updateJmxName(final GenericObjectPoolConfig config) { - if (registeredJmxName == null) { + if (registeredJmxObjectName == null) { return; } - final StringBuilder base = new StringBuilder(registeredJmxName.toString()); + final StringBuilder base = new StringBuilder(registeredJmxObjectName.toString()); base.append(Constants.JMX_CONNECTION_POOL_BASE_EXT); config.setJmxNameBase(base.toString()); config.setJmxNamePrefix(Constants.JMX_CONNECTION_POOL_PREFIX); } protected ObjectName getRegisteredJmxName() { - return registeredJmxName; + return registeredJmxObjectName; } /** http://git-wip-us.apache.org/repos/asf/commons-dbcp/blob/487523a3/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 6bc8666..6c6d8fc 100644 --- a/src/main/java/org/apache/commons/dbcp2/PoolableConnectionFactory.java +++ b/src/main/java/org/apache/commons/dbcp2/PoolableConnectionFactory.java @@ -57,9 +57,9 @@ public class PoolableConnectionFactory * base {@link Connection}s */ public PoolableConnectionFactory(final ConnectionFactory connFactory, - final ObjectName dataSourceJmxName) { + final ObjectName dataSourceJmxObjectName) { _connFactory = connFactory; - this.dataSourceJmxName = dataSourceJmxName; + this.dataSourceJmxName = dataSourceJmxObjectName; } /**
