[commons-pool] 01/07: Make private class GenericKeyedObjectPool.ObjectDeque class static

[ggregory]

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 1416ce453d35e60bece2cd06f5af86f70b3b16e3
Author: Gary Gregory <garydgreg...@gmail.com>
AuthorDate: Sun Mar 5 08:09:43 2023 -0500

    Make private class GenericKeyedObjectPool.ObjectDeque class static
---
 src/changes/changes.xml                                           | 3 +++
 .../org/apache/commons/pool2/impl/GenericKeyedObjectPool.java     | 8 ++++----
 2 files changed, 7 insertions(+), 4 deletions(-)

diff --git a/src/changes/changes.xml b/src/changes/changes.xml
index 1d21c8d3..447d43dd 100644
--- a/src/changes/changes.xml
+++ b/src/changes/changes.xml
@@ -78,6 +78,9 @@ The <action> type attribute can be add,update,fix,remove.
     <action dev="ggregory" type="fix" issue="POOL-411" due-to="Richard Eckart 
de Castilho, Gary Gregory">
       NPE when deregistering key at end of borrow.
     </action>
+    <action dev="ggregory" type="fix" due-to="Gary Gregory">
+      Make private class GenericKeyedObjectPool.ObjectDeque class static.
+    </action>
     <!-- ADD -->
     <action dev="ggregory" type="add" due-to="Gary Gregory">
       Add PooledObject.getFullDuration().
diff --git 
a/src/main/java/org/apache/commons/pool2/impl/GenericKeyedObjectPool.java 
b/src/main/java/org/apache/commons/pool2/impl/GenericKeyedObjectPool.java
index 17fb18df..2badcb31 100644
--- a/src/main/java/org/apache/commons/pool2/impl/GenericKeyedObjectPool.java
+++ b/src/main/java/org/apache/commons/pool2/impl/GenericKeyedObjectPool.java
@@ -96,7 +96,7 @@ public class GenericKeyedObjectPool<K, T, E extends 
Exception> extends BaseGener
      *
      * @param <S> type of objects in the pool
      */
-    private class ObjectDeque<S> {
+    private static class ObjectDeque<S> {
 
         private final LinkedBlockingDeque<PooledObject<S>> idleObjects;
 
@@ -440,7 +440,7 @@ public class GenericKeyedObjectPool<K, T, E extends 
Exception> extends BaseGener
                         try {
                             p = borrowMaxWaitMillis < 0 ? 
objectDeque.getIdleObjects().takeFirst() :
                                 
objectDeque.getIdleObjects().pollFirst(borrowMaxWaitMillis, 
TimeUnit.MILLISECONDS);
-                        } catch (InterruptedException e) {
+                        } catch (final InterruptedException e) {
                             throw cast(e);
                         }
                     }
@@ -766,7 +766,7 @@ public class GenericKeyedObjectPool<K, T, E extends 
Exception> extends BaseGener
                         // the pool is at capacity or not.
                         try {
                             objectDeque.makeObjectCountLock.wait();
-                        } catch (InterruptedException e) {
+                        } catch (final InterruptedException e) {
                             throw cast(e);
                         }
                     }
@@ -1553,7 +1553,7 @@ public class GenericKeyedObjectPool<K, T, E extends 
Exception> extends BaseGener
         int maxQueueLength = 0;
         LinkedBlockingDeque<PooledObject<T>> mostLoaded = null;
         K loadedKey = null;
-        for (final Entry<K, GenericKeyedObjectPool<K, T, E>.ObjectDeque<T>> 
entry : poolMap.entrySet()) {
+        for (final Entry<K, GenericKeyedObjectPool.ObjectDeque<T>> entry : 
poolMap.entrySet()) {
             final K k = entry.getKey();
             final ObjectDeque<T> deque = entry.getValue();
             final LinkedBlockingDeque<PooledObject<T>> pool = 
deque.getIdleObjects();