Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=51583

git-svn-id: https://svn.apache.org/repos/asf/tomcat/trunk@1157874 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
index ff5ce92..090dff6 100644 (file)
--- 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
@@ -364,7 +364,9 @@ public class ConnectionPool {
                         release(con);
                     else
                         abandon(con);
-                    con = pool.poll(1000, TimeUnit.MILLISECONDS);
+                    if (pool.size()>0) {
+                        con = pool.poll(1000, TimeUnit.MILLISECONDS);
+                    }
                 } //while
             } catch (InterruptedException ex) {
                 Thread.interrupted();