diff --git a/pom.xml b/pom.xml index 6adc256b20..ed24d70462 100644 --- a/pom.xml +++ b/pom.xml @@ -3,7 +3,7 @@ 4.0.0 com.alibaba druid - 1.1.7-preview_0 + 1.1.7-preview_9 jar druid @@ -14,6 +14,7 @@ 4.2.5.RELEASE 4.12 + 1.19 true true @@ -462,7 +463,7 @@ mysql mysql-connector-java - 6.0.6 + 5.1.45 provided @@ -716,5 +717,18 @@ test + + org.openjdk.jmh + jmh-core + ${jmh.version} + test + + + org.openjdk.jmh + jmh-generator-annprocess + ${jmh.version} + test + + diff --git a/src/main/java/com/alibaba/druid/pool/DruidConnectionHolder.java b/src/main/java/com/alibaba/druid/pool/DruidConnectionHolder.java index b5ec95c3b6..912b0ce1be 100644 --- a/src/main/java/com/alibaba/druid/pool/DruidConnectionHolder.java +++ b/src/main/java/com/alibaba/druid/pool/DruidConnectionHolder.java @@ -109,6 +109,7 @@ public final class DruidConnectionHolder { if (JdbcConstants.SYBASE.equals(dataSource.dbType) // || JdbcConstants.DB2.equals(dataSource.dbType) // || JdbcConstants.HIVE.equals(dataSource.dbType) // + || JdbcConstants.ODPS.equals(dataSource.dbType) // ) { initUnderlyHoldability = false; }