From 0cd7c412ca14deb97935a16da3315d20d5c590f4 Mon Sep 17 00:00:00 2001
From: fhanik <fhanik@13f79535-47bb-0310-9956-ffa450edef68>
Date: Mon, 15 Aug 2011 15:06:35 +0000
Subject: [PATCH] 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
---
 .../src/main/java/org/apache/tomcat/jdbc/pool/ConnectionPool.java     | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

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 ff5ce925e..090dff620 100644
--- 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();
-- 
2.11.0