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
The following commit(s) were added to refs/heads/master by this push: new 0aa302b7 Rename internal method 0aa302b7 is described below commit 0aa302b76f51f642800c8615b77c241a68bd12ac Author: Gary Gregory <garydgreg...@gmail.com> AuthorDate: Tue Jun 10 18:16:00 2025 -0400 Rename internal method --- .../java/org/apache/commons/pool3/impl/BaseGenericObjectPool.java | 2 +- .../java/org/apache/commons/pool3/impl/GenericKeyedObjectPool.java | 4 ++-- src/main/java/org/apache/commons/pool3/impl/GenericObjectPool.java | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/src/main/java/org/apache/commons/pool3/impl/BaseGenericObjectPool.java b/src/main/java/org/apache/commons/pool3/impl/BaseGenericObjectPool.java index fe370ef9..fc3bfbbf 100644 --- a/src/main/java/org/apache/commons/pool3/impl/BaseGenericObjectPool.java +++ b/src/main/java/org/apache/commons/pool3/impl/BaseGenericObjectPool.java @@ -214,7 +214,7 @@ public abstract class BaseGenericObjectPool<T, E extends Exception> extends Base * @param pooledObject contains the object to wrap. * @return a new instance wrapping the object in the {@link PooledObject}. */ - static <T> IdentityWrapper<T> on(final PooledObject<T> pooledObject) { + static <T> IdentityWrapper<T> unwrap(final PooledObject<T> pooledObject) { return new IdentityWrapper<>(pooledObject.getObject()); } diff --git a/src/main/java/org/apache/commons/pool3/impl/GenericKeyedObjectPool.java b/src/main/java/org/apache/commons/pool3/impl/GenericKeyedObjectPool.java index eae0930d..a4ca26c7 100644 --- a/src/main/java/org/apache/commons/pool3/impl/GenericKeyedObjectPool.java +++ b/src/main/java/org/apache/commons/pool3/impl/GenericKeyedObjectPool.java @@ -817,7 +817,7 @@ public class GenericKeyedObjectPool<K, T, E extends Exception> extends BaseGener } createdCount.incrementAndGet(); - objectDeque.getAllObjects().put(IdentityWrapper.on(p), p); + objectDeque.getAllObjects().put(IdentityWrapper.unwrap(p), p); return p; } @@ -880,7 +880,7 @@ public class GenericKeyedObjectPool<K, T, E extends Exception> extends BaseGener } } if (isIdle || always) { - objectDeque.getAllObjects().remove(IdentityWrapper.on(toDestroy)); + objectDeque.getAllObjects().remove(IdentityWrapper.unwrap(toDestroy)); toDestroy.invalidate(); try { diff --git a/src/main/java/org/apache/commons/pool3/impl/GenericObjectPool.java b/src/main/java/org/apache/commons/pool3/impl/GenericObjectPool.java index e444df06..d8e53d14 100644 --- a/src/main/java/org/apache/commons/pool3/impl/GenericObjectPool.java +++ b/src/main/java/org/apache/commons/pool3/impl/GenericObjectPool.java @@ -606,7 +606,7 @@ public class GenericObjectPool<T, E extends Exception> extends BaseGenericObject private void destroy(final PooledObject<T> toDestroy, final DestroyMode destroyMode) throws E { toDestroy.invalidate(); idleObjects.remove(toDestroy); - allObjects.remove(IdentityWrapper.on(toDestroy)); + allObjects.remove(IdentityWrapper.unwrap(toDestroy)); try { factory.destroyObject(toDestroy, destroyMode); } finally {