svn commit: r1616629 - /tomcat/trunk/modules/jdbc-pool/src/main/java/org/apache/tomcat/jdbc/pool/DataSourceProxy.java

[fhanik]

Author: fhanik
Date: Thu Aug  7 23:28:19 2014
New Revision: 1616629

URL: http://svn.apache.org/r1616629
Log:
Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=56789
Always return a pool, never null

Modified:
    
tomcat/trunk/modules/jdbc-pool/src/main/java/org/apache/tomcat/jdbc/pool/DataSourceProxy.java

Modified: 
tomcat/trunk/modules/jdbc-pool/src/main/java/org/apache/tomcat/jdbc/pool/DataSourceProxy.java
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/modules/jdbc-pool/src/main/java/org/apache/tomcat/jdbc/pool/DataSourceProxy.java?rev=1616629&r1=1616628&r2=1616629&view=diff
==============================================================================
--- 
tomcat/trunk/modules/jdbc-pool/src/main/java/org/apache/tomcat/jdbc/pool/DataSourceProxy.java
 (original)
+++ 
tomcat/trunk/modules/jdbc-pool/src/main/java/org/apache/tomcat/jdbc/pool/DataSourceProxy.java
 Thu Aug  7 23:28:19 2014
@@ -191,7 +191,12 @@ public class DataSourceProxy implements 
     }
 
     public ConnectionPool getPool() {
-        return pool;
+        try {
+            return createPool();
+        }catch (SQLException x) {
+            log.error("Error during connection pool creation.", x);
+            return null;
+        }
     }
 
 
@@ -208,7 +213,7 @@ public class DataSourceProxy implements 
                 }
             }
         }catch (Exception x) {
-            log.warn("Error duing connection pool closure.", x);
+            log.warn("Error during connection pool closure.", x);
         }
     }
 



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