Repository: commons-pool Updated Branches: refs/heads/master 865d95848 -> 568b5fc45
Better private ivar name. Project: http://git-wip-us.apache.org/repos/asf/commons-pool/repo Commit: http://git-wip-us.apache.org/repos/asf/commons-pool/commit/568b5fc4 Tree: http://git-wip-us.apache.org/repos/asf/commons-pool/tree/568b5fc4 Diff: http://git-wip-us.apache.org/repos/asf/commons-pool/diff/568b5fc4 Branch: refs/heads/master Commit: 568b5fc4512aaf9ab2d4cf4701588512e27f6059 Parents: 865d958 Author: Gary Gregory <garydgreg...@gmail.com> Authored: Sat May 26 09:40:52 2018 -0600 Committer: Gary Gregory <garydgreg...@gmail.com> Committed: Sat May 26 09:40:52 2018 -0600 ---------------------------------------------------------------------- .../commons/pool2/impl/BaseGenericObjectPool.java | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/commons-pool/blob/568b5fc4/src/main/java/org/apache/commons/pool2/impl/BaseGenericObjectPool.java ---------------------------------------------------------------------- diff --git a/src/main/java/org/apache/commons/pool2/impl/BaseGenericObjectPool.java b/src/main/java/org/apache/commons/pool2/impl/BaseGenericObjectPool.java index 1150b0f..cb6d5a8 100644 --- a/src/main/java/org/apache/commons/pool2/impl/BaseGenericObjectPool.java +++ b/src/main/java/org/apache/commons/pool2/impl/BaseGenericObjectPool.java @@ -110,7 +110,7 @@ public abstract class BaseGenericObjectPool<T> extends BaseObject { // Monitoring (primarily JMX) attributes - private final ObjectName oname; + private final ObjectName objectName; private final String creationStackTrace; private final AtomicLong borrowedCount = new AtomicLong(0); private final AtomicLong returnedCount = new AtomicLong(0); @@ -137,9 +137,9 @@ public abstract class BaseGenericObjectPool<T> extends BaseObject { public BaseGenericObjectPool(final BaseObjectPoolConfig<T> config, final String jmxNameBase, final String jmxNamePrefix) { if (config.getJmxEnabled()) { - this.oname = jmxRegister(config, jmxNameBase, jmxNamePrefix); + this.objectName = jmxRegister(config, jmxNameBase, jmxNamePrefix); } else { - this.oname = null; + this.objectName = null; } // Populate the creation stack trace @@ -777,7 +777,7 @@ public abstract class BaseGenericObjectPool<T> extends BaseObject { * @return the JMX name */ public final ObjectName getJmxName() { - return oname; + return objectName; } /** @@ -970,10 +970,10 @@ public abstract class BaseGenericObjectPool<T> extends BaseObject { * Unregisters this pool's MBean. */ final void jmxUnregister() { - if (oname != null) { + if (objectName != null) { try { ManagementFactory.getPlatformMBeanServer().unregisterMBean( - oname); + objectName); } catch (final MBeanRegistrationException | InstanceNotFoundException e) { swallowException(e); } @@ -1337,7 +1337,7 @@ public abstract class BaseGenericObjectPool<T> extends BaseObject { builder.append(", factoryClassLoader="); builder.append(factoryClassLoader); builder.append(", oname="); - builder.append(oname); + builder.append(objectName); builder.append(", creationStackTrace="); builder.append(creationStackTrace); builder.append(", borrowedCount=");
