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

bug fixed jetty jndi

Browse Source
This commit is contained in:
wenshao
2012-12-10 17:51:51 +08:00
parent d35329918e
commit 2abc2d207e
1 changed files with 7 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/main/java/com/alibaba/druid/pool/DruidDataSourceFactory.java
+7 -4
View File
@@ -95,9 +95,12 @@ 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())) //
&& (!"com.alibaba.druid.pool.DruidDataSource".equals(ref.getClassName())) //
) {
return null;
}
Properties properties = new Properties();
for (int i = 0; i < ALL_PROPERTIES.length; i++) {
@@ -111,7 +114,7 @@ public class DruidDataSourceFactory implements ObjectFactory {
return createDataSourceInternal(properties);
}
protected DataSource createDataSourceInternal(Properties properties) throws Exception {
DruidDataSource dataSource = new DruidDataSource();
config(dataSource, properties);