From 088c7d185b8f51cff4c1f7eb59f572fc5736e132 Mon Sep 17 00:00:00 2001 From: charles Date: Sun, 9 Dec 2012 23:45:59 +0800 Subject: [PATCH 1/2] Update src/main/java/com/alibaba/druid/pool/DruidDataSource.java --- src/main/java/com/alibaba/druid/pool/DruidDataSource.java | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/src/main/java/com/alibaba/druid/pool/DruidDataSource.java b/src/main/java/com/alibaba/druid/pool/DruidDataSource.java index ebdf806952..4cda1552a8 100644 --- a/src/main/java/com/alibaba/druid/pool/DruidDataSource.java +++ b/src/main/java/com/alibaba/druid/pool/DruidDataSource.java @@ -1438,6 +1438,10 @@ public class DruidDataSource extends DruidAbstractDataSource implements DruidDat final String factoryName = className + "Factory"; // XXX: not robust Reference ref = new Reference(className, factoryName, null); ref.add(new StringRefAddr("instanceKey", instanceKey)); + ref.add(new StringRefAddr("url", this.getUrl())); + ref.add(new StringRefAddr("username", this.getUsername())); + ref.add(new StringRefAddr("password",this.getPassword())); + //TODO ADD OTHER PROPERTIES return ref; } From 0088daf98ac6054158a4758a6904a7ef4e7a0917 Mon Sep 17 00:00:00 2001 From: charles Date: Sun, 9 Dec 2012 23:53:02 +0800 Subject: [PATCH 2/2] Update src/main/java/com/alibaba/druid/pool/DruidDataSourceFactory.java MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 这个判断有问题,为啥要做这个判断呢? --- .../java/com/alibaba/druid/pool/DruidDataSourceFactory.java | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/main/java/com/alibaba/druid/pool/DruidDataSourceFactory.java b/src/main/java/com/alibaba/druid/pool/DruidDataSourceFactory.java index 46df39b4a6..ced815a842 100644 --- a/src/main/java/com/alibaba/druid/pool/DruidDataSourceFactory.java +++ b/src/main/java/com/alibaba/druid/pool/DruidDataSourceFactory.java @@ -95,9 +95,9 @@ public class DruidDataSourceFactory implements ObjectFactory { return null; } Reference ref = (Reference) obj; - if (!"javax.sql.DataSource".equals(ref.getClassName())) { - return null; - } + //if (!"javax.sql.DataSource".equals(ref.getClassName())) { + // return null; + //} Properties properties = new Properties(); for (int i = 0; i < ALL_PROPERTIES.length; i++) {