Followup for r1157874 which is a Fix for https://issues.apache.org/bugzilla/show_bug...

Break loop immediately, because con is never set to null and you'll try releasing it twice.

git-svn-id: https://svn.apache.org/repos/asf/tomcat/trunk@1162102 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 090dff6..b2a7644 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
@@ -366,6 +366,8 @@ public class ConnectionPool {
                         abandon(con);
                     if (pool.size()>0) {
                         con = pool.poll(1000, TimeUnit.MILLISECONDS);
+                    } else {
+                        break;
                     }
                 } //while
             } catch (InterruptedException ex) {