From a6e36f5415df01eb6fb732098841d52f544ec34c Mon Sep 17 00:00:00 2001 From: Sky Date: Thu, 18 Jun 2015 17:20:13 +0800 Subject: [PATCH 1/2] Update JdbcConstants.java oracle.jdbc.driver is deprecated. Now oracle.jdbc is supported. --- src/main/java/com/alibaba/druid/util/JdbcConstants.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/java/com/alibaba/druid/util/JdbcConstants.java b/src/main/java/com/alibaba/druid/util/JdbcConstants.java index 0a93ece9b3..454cd69f50 100644 --- a/src/main/java/com/alibaba/druid/util/JdbcConstants.java +++ b/src/main/java/com/alibaba/druid/util/JdbcConstants.java @@ -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"; From 27cef9aa84e11eeb6bc52b5e06b9857e8c6db2f3 Mon Sep 17 00:00:00 2001 From: junfengcode Date: Fri, 19 Jun 2015 11:39:27 +0800 Subject: [PATCH 2/2] =?UTF-8?q?[*]=E8=BF=94=E5=9B=9E=E5=8E=9F=E6=9D=A5?= =?UTF-8?q?=E7=9A=84name=EF=BC=8C=E8=80=8C=E4=B8=8D=E6=98=AFnull=EF=BC=8C?= =?UTF-8?q?=E9=81=BF=E5=85=8DNullPointerException?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/main/java/com/alibaba/druid/pool/DruidDataSource.java | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/src/main/java/com/alibaba/druid/pool/DruidDataSource.java b/src/main/java/com/alibaba/druid/pool/DruidDataSource.java index 8a73839301..5fe83ef43c 100644 --- a/src/main/java/com/alibaba/druid/pool/DruidDataSource.java +++ b/src/main/java/com/alibaba/druid/pool/DruidDataSource.java @@ -2728,7 +2728,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