Eliminate the dependence on maxActive of busy queues and idle queue in order to enable the expansion of the pool size via JMX.

Keiichi Fujino · Keiichi Fujino · commit d1abeaa2d46d · 2015-07-23T10:27:58.000Z
git-svn-id: https://svn.apache.org/repos/asf/tomcat/trunk@1692372 13f79535-47bb-0310-9956-ffa450edef68
diff --git a/modules/jdbc-pool/src/main/java/org/apache/tomcat/jdbc/pool/ConnectionPool.java b/modules/jdbc-pool/src/main/java/org/apache/tomcat/jdbc/pool/ConnectionPool.java
@@ -29,7 +29,6 @@
 import java.util.Set;
 import java.util.Timer;
 import java.util.TimerTask;
-import java.util.concurrent.ArrayBlockingQueue;
 import java.util.concurrent.BlockingQueue;
 import java.util.concurrent.CountDownLatch;
 import java.util.concurrent.ExecutionException;
@@ -439,7 +438,7 @@ protected void init(PoolConfiguration properties) throws SQLException {
         }
 
         //make space for 10 extra in case we flow over a bit
-        busy = new ArrayBlockingQueue<>(properties.getMaxActive(),false);
+        busy = new LinkedBlockingQueue<>();
         //busy = new FairBlockingQueue<PooledConnection>();
         //make space for 10 extra in case we flow over a bit
         if (properties.isFairQueue()) {
@@ -448,7 +447,7 @@ protected void init(PoolConfiguration properties) throws SQLException {
             //idle = new LinkedTransferQueue<PooledConnection>();
             //idle = new ArrayBlockingQueue<PooledConnection>(properties.getMaxActive(),false);
         } else {
-            idle = new ArrayBlockingQueue<>(properties.getMaxActive(),properties.isFairQueue());
+            idle = new LinkedBlockingQueue<>();
         }
 
         initializePoolCleaner(properties);
