Update Commons Pool to 2.13.1

Author: markt-asf

MERGE.txt

@@ -58,7 +58,7 @@ Unused classes removed
 Sub-tree
 src/main/java/org/apache/commons/pool2
 The SHA1 ID / tag for the most recent commit to be merged to Tomcat is:
-rel/commons-pool-2.13.0 (2025-12-09)
+rel/commons-pool-2.13.1 (2025-12-30)
 
 DBCP2
 No unused code removed

java/org/apache/tomcat/dbcp/pool2/KeyedPooledObjectFactory.java

@@ -62,7 +62,7 @@
  * While clients of a {@link KeyedObjectPool} borrow and return instances of
  * the underlying value type V, the factory methods act on instances of
  * {@link PooledObject PooledObject<V>}.  These are the object wrappers that
- * pools use to track and maintain state informations about the objects that
+ * pools use to track and maintain state information about the objects that
  * they manage.
  * </p>
  *

java/org/apache/tomcat/dbcp/pool2/impl/DefaultEvictionPolicy.java

@@ -31,7 +31,7 @@
  *     {@link GenericKeyedObjectPoolConfig#getMinIdlePerKey()} idle objects in
  *     the pool and the object has been idle for longer than
  *     {@link GenericObjectPool#getSoftMinEvictableIdleDuration()} /
- *     {@link GenericKeyedObjectPool#getSoftMinEvictableIdleDuration()}
+ *     {@link GenericKeyedObjectPool#getSoftMinEvictableIdleDuration()}</li>
  * </ul>
  * <p>
  * This class is immutable and thread-safe.

java/org/apache/tomcat/dbcp/pool2/impl/EvictionTimer.java

@@ -31,7 +31,7 @@
  * <p>
  * This class is currently implemented using {@link ScheduledThreadPoolExecutor}. This implementation may change in any
  * future release. This class keeps track of how many pools are using it. If no pools are using the timer, it is
- * cancelled. This prevents a thread being left running which, in application server environments, can lead to memory
+ * canceled. This prevents a thread being left running which, in application server environments, can lead to memory
  * leads and/or prevent applications from shutting down or reloading cleanly.
  * </p>
  * <p>
@@ -133,7 +133,7 @@ public void run() {
     /**
      * Removes the specified eviction task from the timer.
      *
-     * @param evictor   Task to be cancelled.
+     * @param evictor   Task to be canceled.
      * @param timeout   If the associated executor is no longer required, how
      *                  long should this thread wait for the executor to
      *                  terminate?

java/org/apache/tomcat/dbcp/pool2/impl/GenericKeyedObjectPool.java

@@ -789,7 +789,7 @@ public void close() {
             jmxUnregister();
 
             // Release any threads that were waiting for an object
-            poolMap.values().forEach(e -> e.getIdleObjects().interuptTakeWaiters());
+            poolMap.values().forEach(e -> e.getIdleObjects().interruptTakeWaiters());
             // This clear cleans up the keys now any waiting threads have been
             // interrupted
             clear();

java/org/apache/tomcat/dbcp/pool2/impl/GenericObjectPool.java

@@ -212,10 +212,10 @@ public void addObject() throws Exception {
         if (factory == null) {
             throw new IllegalStateException("Cannot add objects without a factory.");
         }
-
-        final int localMaxTotal = getMaxTotal();
         final int localMaxIdle = getMaxIdle();
-        if (getNumIdle() < localMaxIdle && (localMaxTotal < 0 || createCount.get() < localMaxTotal)) {
+        final int localMaxTotal = getMaxTotal();
+        if ((localMaxIdle < 0 || getNumIdle() < localMaxIdle) &&
+                (localMaxTotal < 0 || createCount.get() < localMaxTotal)) {
             addIdleObject(create(getMaxWaitDuration()));
         }
     }
@@ -479,7 +479,7 @@ public void close() {
             jmxUnregister();
 
             // Release any threads that were waiting for an object
-            idleObjects.interuptTakeWaiters();
+            idleObjects.interruptTakeWaiters();
         }
     }
 

java/org/apache/tomcat/dbcp/pool2/impl/LinkedBlockingDeque.java

@@ -585,7 +585,7 @@ boolean hasTakeWaiters() {
      * Interrupts the threads currently waiting to take an object from the pool. See disclaimer on accuracy in
      * {@link java.util.concurrent.locks.ReentrantLock#getWaitingThreads(Condition)}.
      */
-    void interuptTakeWaiters() {
+    void interruptTakeWaiters() {
         lock.lock();
         try {
             lock.interruptWaiters(notEmpty);

webapps/docs/changelog.xml

@@ -316,7 +316,7 @@
       </update>
       <!-- Entries for backport and removal before 12.0.0-M1 below this line -->
       <update>
-        Update the internal fork of Commons Pool to 2.13.0. (markt)
+        Update the internal fork of Commons Pool to 2.13.1. (markt)
       </update>
       <update>
         Update the internal fork of Commons DBCP to 2.14.0. (markt)