This is an automated email from the ASF dual-hosted git repository. ggregory pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/commons-pool.git
commit 883236bee7bcba4b93425d9c1ea60424f7fb696c Author: Gary Gregory <[email protected]> AuthorDate: Tue Jun 29 09:11:42 2021 -0400 Remove extra whitespace. Use final. Remove unused imports. --- src/main/java/org/apache/commons/pool2/PoolUtils.java | 2 +- src/main/java/org/apache/commons/pool2/impl/AbandonedConfig.java | 4 ++-- src/main/java/org/apache/commons/pool2/impl/GenericObjectPool.java | 6 ++---- 3 files changed, 5 insertions(+), 7 deletions(-) diff --git a/src/main/java/org/apache/commons/pool2/PoolUtils.java b/src/main/java/org/apache/commons/pool2/PoolUtils.java index 763028f..7b1f4d5 100644 --- a/src/main/java/org/apache/commons/pool2/PoolUtils.java +++ b/src/main/java/org/apache/commons/pool2/PoolUtils.java @@ -1801,7 +1801,7 @@ public final class PoolUtils { if (pool == null) { throw new IllegalArgumentException(MSG_NULL_POOL); } - + /* * assert !(pool instanceof GenericObjectPool) : * "GenericObjectPool is already thread-safe"; assert !(pool instanceof diff --git a/src/main/java/org/apache/commons/pool2/impl/AbandonedConfig.java b/src/main/java/org/apache/commons/pool2/impl/AbandonedConfig.java index 31e1250..be3f1bb 100644 --- a/src/main/java/org/apache/commons/pool2/impl/AbandonedConfig.java +++ b/src/main/java/org/apache/commons/pool2/impl/AbandonedConfig.java @@ -44,7 +44,7 @@ public class AbandonedConfig { public static AbandonedConfig copy(final AbandonedConfig abandonedConfig) { return abandonedConfig == null ? null : new AbandonedConfig(abandonedConfig); } - + /** * Whether or not borrowObject performs abandoned object removal. */ @@ -102,7 +102,7 @@ public class AbandonedConfig { * @param abandonedConfig the source. */ @SuppressWarnings("resource") - private AbandonedConfig(AbandonedConfig abandonedConfig) { + private AbandonedConfig(final AbandonedConfig abandonedConfig) { this.setLogAbandoned(abandonedConfig.getLogAbandoned()); this.setLogWriter(abandonedConfig.getLogWriter()); this.setRemoveAbandonedOnBorrow(abandonedConfig.getRemoveAbandonedOnBorrow()); diff --git a/src/main/java/org/apache/commons/pool2/impl/GenericObjectPool.java b/src/main/java/org/apache/commons/pool2/impl/GenericObjectPool.java index e6405f6..a53b2d3 100644 --- a/src/main/java/org/apache/commons/pool2/impl/GenericObjectPool.java +++ b/src/main/java/org/apache/commons/pool2/impl/GenericObjectPool.java @@ -17,9 +17,7 @@ package org.apache.commons.pool2.impl; import java.time.Duration; -import java.time.Instant; import java.util.ArrayList; -import java.util.HashSet; import java.util.Map; import java.util.NoSuchElementException; import java.util.Set; @@ -279,7 +277,7 @@ public class GenericObjectPool<T> extends BaseGenericObjectPool<T> assertOpen(); final AbandonedConfig ac = this.abandonedConfig; - if (ac != null && ac.getRemoveAbandonedOnBorrow() && (getNumIdle() < 2) && + if (ac != null && ac.getRemoveAbandonedOnBorrow() && (getNumIdle() < 2) && (getNumActive() > getMaxTotal() - 3)) { removeAbandoned(ac); } @@ -374,7 +372,7 @@ public class GenericObjectPool<T> extends BaseGenericObjectPool<T> @Override String getStatsString() { // Simply listed in AB order. - return super.getStatsString() + + return super.getStatsString() + String.format(", createdCount=%,d, makeObjectCount=%,d, maxIdle=%,d, minIdle=%,d", createdCount.get(), makeObjectCount, maxIdle, minIdle); }
