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 remote-tracking branch 'upstream/master'

Browse Source
This commit is contained in:
wenshao
2015-06-20 23:10:32 +08:00
parent d553c2d7e9 e78c15ca99
commit 11cd23ede8
2 changed files with 4 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/main/java/com/alibaba/druid/pool/DruidDataSource.java
+3 -1
View File
@@ -2745,7 +2745,9 @@ public class DruidDataSource extends DruidAbstractDataSource
@Override
public ObjectName preRegister(MBeanServer server, ObjectName name) throws Exception {
return null;
//do nothing
//return original name to avoid NullPointerException
return name;
}
@Override
src/main/java/com/alibaba/druid/util/JdbcConstants.java
+1 -1
View File
@@ -36,7 +36,7 @@ public interface JdbcConstants {
public static final String SQL_SERVER_DRIVER = "com.microsoft.jdbc.sqlserver.SQLServerDriver";
public static final String ORACLE = "oracle";
public static final String ORACLE_DRIVER = "oracle.jdbc.driver.OracleDriver";
public static final String ORACLE_DRIVER = "oracle.jdbc.OracleDriver";
public static final String ALI_ORACLE = "AliOracle";
public static final String ALI_ORACLE_DRIVER = "com.alibaba.jdbc.AlibabaDriver";