From 2dc60d69ae1daa18fb9f5849ea1b241606bd085f Mon Sep 17 00:00:00 2001 From: fhanik Date: Tue, 25 Nov 2008 23:23:21 +0000 Subject: [PATCH] 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 --- .../java/org/apache/tomcat/jdbc/pool/DataSourceFactory.java | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) 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 d319d3ad3..6ad3a9bb5 100644 --- 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) { -- 2.11.0