Author: fhanik
Date: Fri May 20 22:03:39 2011
New Revision: 1125573

URL: http://svn.apache.org/viewvc?rev=1125573&view=rev
Log:
https://issues.apache.org/bugzilla/show_bug.cgi?id=51185


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=1125573&r1=1125572&r2=1125573&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
 Fri May 20 22:03:39 2011
@@ -92,7 +92,20 @@ public class DataSourceProxy implements 
      * @return Driver
      * @throws SQLException
      */
-    public synchronized ConnectionPool createPool() throws SQLException {
+    public ConnectionPool createPool() throws SQLException {
+        if (pool != null) {
+            return pool;
+        } else {
+            return pCreatePool();
+        }
+    }
+    
+    /**
+     * Sets up the connection pool, by creating a pooling driver.
+     * @return Driver
+     * @throws SQLException
+     */
+    private synchronized ConnectionPool pCreatePool() throws SQLException {
         if (pool != null) {
             return pool;
         } else {



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

Reply via email to