svn commit: r720640 - /tomcat/trunk/modules/jdbc-pool/java/org/apache/tomcat/jdbc/pool/ConnectionPool.java

[fh...@apache.org]

Author: fhanik
Date: Tue Nov 25 14:56:58 2008
New Revision: 720640

URL: http://svn.apache.org/viewvc?rev=720640&view=rev
Log:
Pool should throw a SQL exception, never return null

Modified:
    tomcat/trunk/modules/jdbc-pool/java/org/apache/tomcat/jdbc/pool/ConnectionPool.java

Modified: tomcat/trunk/modules/jdbc-pool/java/org/apache/tomcat/jdbc/pool/ConnectionPool.java
URL: http://svn.apache.org/viewvc/tomcat/trunk/modules/jdbc-pool/java/org/apache/tomcat/jdbc/pool/ConnectionPool.java?rev=720640&r1=720639&r2=720640&view=diff
==============================================================================
--- tomcat/trunk/modules/jdbc-pool/java/org/apache/tomcat/jdbc/pool/ConnectionPool.java (original)
+++ tomcat/trunk/modules/jdbc-pool/java/org/apache/tomcat/jdbc/pool/ConnectionPool.java Tue Nov 25 14:56:58 2008
@@ -418,8 +418,9 @@
             } 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) {



---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@tomcat.apache.org
For additional commands, e-mail: dev-help@tomcat.apache.org