From 06f48eaa88fa51f23568c516680b01306d3cabce Mon Sep 17 00:00:00 2001 From: fhanik Date: Tue, 25 Nov 2008 22:56:58 +0000 Subject: [PATCH] Pool should throw a SQL exception, never return null git-svn-id: https://svn.apache.org/repos/asf/tomcat/trunk@720640 13f79535-47bb-0310-9956-ffa450edef68 --- .../jdbc-pool/java/org/apache/tomcat/jdbc/pool/ConnectionPool.java | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/modules/jdbc-pool/java/org/apache/tomcat/jdbc/pool/ConnectionPool.java b/modules/jdbc-pool/java/org/apache/tomcat/jdbc/pool/ConnectionPool.java index 91c4d9141..fd89e0f60 100644 --- a/modules/jdbc-pool/java/org/apache/tomcat/jdbc/pool/ConnectionPool.java +++ b/modules/jdbc-pool/java/org/apache/tomcat/jdbc/pool/ConnectionPool.java @@ -418,8 +418,9 @@ public class ConnectionPool { } catch (InterruptedException ex) { Thread.currentThread().interrupted(); } - if (maxWait==0) { //no wait, return one if we have one - return con; + if (maxWait==0 && con == null) { //no wait, return one if we have one + throw new SQLException("[" + Thread.currentThread().getName()+"] " + + "NoWait: Pool empty. Unable to fetch a connection, none available["+busy.size()+" in use]."); } //we didn't get a connection, lets see if we timed out if (con == null) { -- 2.11.0