Repository: commons-dbcp Updated Branches: refs/heads/master 487523a34 -> 9bc78d88a
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/9bc78d88 Tree: http://git-wip-us.apache.org/repos/asf/commons-dbcp/tree/9bc78d88 Diff: http://git-wip-us.apache.org/repos/asf/commons-dbcp/diff/9bc78d88 Branch: refs/heads/master Commit: 9bc78d88aeb12b5b8bd5d39e4dd9a81c72b3664d Parents: 487523a Author: Gary Gregory <ggreg...@apache.org> Authored: Tue Jan 16 13:39:10 2018 -0700 Committer: Gary Gregory <ggreg...@apache.org> Committed: Tue Jan 16 13:39:10 2018 -0700 ---------------------------------------------------------------------- .../org/apache/commons/dbcp2/BasicDataSource.java | 4 ++-- .../apache/commons/dbcp2/PoolableConnection.java | 16 ++++++++-------- 2 files changed, 10 insertions(+), 10 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/commons-dbcp/blob/9bc78d88/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 67a0fc4..8ceecbe 100644 --- a/src/main/java/org/apache/commons/dbcp2/BasicDataSource.java +++ b/src/main/java/org/apache/commons/dbcp2/BasicDataSource.java @@ -2388,7 +2388,7 @@ public class BasicDataSource implements DataSource, BasicDataSourceMXBean, MBean } @Override - public ObjectName preRegister(final MBeanServer server, final ObjectName name) { + public ObjectName preRegister(final MBeanServer server, final ObjectName objectName) { final String requestedName = getJmxName(); if (requestedName != null) { try { @@ -2399,7 +2399,7 @@ public class BasicDataSource implements DataSource, BasicDataSourceMXBean, MBean } } if (registeredJmxObjectName == null) { - registeredJmxObjectName = name; + registeredJmxObjectName = objectName; } return registeredJmxObjectName; } http://git-wip-us.apache.org/repos/asf/commons-dbcp/blob/9bc78d88/src/main/java/org/apache/commons/dbcp2/PoolableConnection.java ---------------------------------------------------------------------- diff --git a/src/main/java/org/apache/commons/dbcp2/PoolableConnection.java b/src/main/java/org/apache/commons/dbcp2/PoolableConnection.java index d4fd349..1a0d253 100644 --- a/src/main/java/org/apache/commons/dbcp2/PoolableConnection.java +++ b/src/main/java/org/apache/commons/dbcp2/PoolableConnection.java @@ -58,7 +58,7 @@ public class PoolableConnection extends DelegatingConnection<Connection> /** The pool to which I should return. */ private final ObjectPool<PoolableConnection> _pool; - private final ObjectName _jmxName; + private final ObjectName _jmxObjectName; // Use a prepared statement for validation, retaining the last used SQL to // check if the validation query has changed. @@ -85,23 +85,23 @@ public class PoolableConnection extends DelegatingConnection<Connection> * * @param conn my underlying connection * @param pool the pool to which I should return when closed - * @param jmxName JMX name + * @param jmxObjectName JMX name * @param disconnectSqlCodes SQL_STATE codes considered fatal disconnection errors * @param fastFailValidation true means fatal disconnection errors cause subsequent * validations to fail immediately (no attempt to run query or isValid) */ public PoolableConnection(final Connection conn, - final ObjectPool<PoolableConnection> pool, final ObjectName jmxName, final Collection<String> disconnectSqlCodes, + final ObjectPool<PoolableConnection> pool, final ObjectName jmxObjectName, final Collection<String> disconnectSqlCodes, final boolean fastFailValidation) { super(conn); _pool = pool; - _jmxName = jmxName; + _jmxObjectName = jmxObjectName; _disconnectionSqlCodes = disconnectSqlCodes; _fastFailValidation = fastFailValidation; - if (jmxName != null) { + if (jmxObjectName != null) { try { - MBEAN_SERVER.registerMBean(this, jmxName); + MBEAN_SERVER.registerMBean(this, jmxObjectName); } catch (InstanceAlreadyExistsException | MBeanRegistrationException | NotCompliantMBeanException e) { // For now, simply skip registration @@ -222,9 +222,9 @@ public class PoolableConnection extends DelegatingConnection<Connection> */ @Override public void reallyClose() throws SQLException { - if (_jmxName != null) { + if (_jmxObjectName != null) { try { - MBEAN_SERVER.unregisterMBean(_jmxName); + MBEAN_SERVER.unregisterMBean(_jmxObjectName); } catch (MBeanRegistrationException | InstanceNotFoundException e) { // Ignore }
