Alawn/Druid
1
0
Fork 0
mirror of https://github.com/alibaba/druid.git synced 2023-03-04 19:17:16 +00:00
Code Issues Releases Wiki Activity

Merge pull request #223 from redcreen/master

Browse Source 
修复通过jndi的方式使用datasource时返回null的错误
This commit is contained in:
温高铁
2012-12-09 08:02:05 -08:00
parent 324ea90580 0088daf98a
commit 5b13b6b3cf
2 changed files with 7 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/main/java/com/alibaba/druid/pool/DruidDataSource.java
+4
View File
@@ -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;
}
src/main/java/com/alibaba/druid/pool/DruidDataSourceFactory.java
+3 -3
View File
@@ -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++) {