we don't have to wrap it anymore, since the extension implements the interface directly

git-svn-id: https://svn.apache.org/repos/asf/tomcat/trunk@720646 13f79535-47bb-0310-9956-ffa450edef68

diff --git a/modules/jdbc-pool/java/org/apache/tomcat/jdbc/pool/DataSourceFactory.java b/modules/jdbc-pool/java/org/apache/tomcat/jdbc/pool/DataSourceFactory.java
index d319d3a..6ad3a9b 100644 (file)
--- a/modules/jdbc-pool/java/org/apache/tomcat/jdbc/pool/DataSourceFactory.java
+++ b/modules/jdbc-pool/java/org/apache/tomcat/jdbc/pool/DataSourceFactory.java
@@ -195,7 +195,7 @@ public class DataSourceFactory implements ObjectFactory {
      * @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 @@ public class DataSourceFactory implements ObjectFactory {
         
 
         // Return the configured DataSource instance
-        DataSource ds = getDataSource(dataSource);
-        return ds;
+        return dataSource;
     }
 
     public static DataSource getDataSource(org.apache.tomcat.jdbc.pool.DataSourceProxy dataSource) {