svn commit: r720646 - /tomcat/trunk/modules/jdbc-pool/java/org/apache/tomcat/jdbc/pool/DataSourceFactory.java

[fhanik]

Author: fhanik
Date: Tue Nov 25 15:23:21 2008
New Revision: 720646

URL: http://svn.apache.org/viewvc?rev=720646&view=rev
Log:
we don't have to wrap it anymore, since the extension implements the interface 
directly

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

Modified: 
tomcat/trunk/modules/jdbc-pool/java/org/apache/tomcat/jdbc/pool/DataSourceFactory.java
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/modules/jdbc-pool/java/org/apache/tomcat/jdbc/pool/DataSourceFactory.java?rev=720646&r1=720645&r2=720646&view=diff
==============================================================================
--- 
tomcat/trunk/modules/jdbc-pool/java/org/apache/tomcat/jdbc/pool/DataSourceFactory.java
 (original)
+++ 
tomcat/trunk/modules/jdbc-pool/java/org/apache/tomcat/jdbc/pool/DataSourceFactory.java
 Tue Nov 25 15:23:21 2008
@@ -195,7 +195,7 @@
      * @throws Exception if an error occurs creating the data source
      */
     public static DataSource createDataSource(Properties properties) throws 
Exception {
-        org.apache.tomcat.jdbc.pool.DataSourceProxy dataSource = new 
org.apache.tomcat.jdbc.pool.DataSourceProxy();
+        org.apache.tomcat.jdbc.pool.DataSource dataSource = new 
org.apache.tomcat.jdbc.pool.DataSource();
 
         String value = null;
 
@@ -399,8 +399,7 @@
         
 
         // Return the configured DataSource instance
-        DataSource ds = getDataSource(dataSource);
-        return ds;
+        return dataSource;
     }
 
     public static DataSource 
getDataSource(org.apache.tomcat.jdbc.pool.DataSourceProxy dataSource) {



---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]