diff --git a/pom.xml b/pom.xml index 2104fe36d0..3be14d18ab 100644 --- a/pom.xml +++ b/pom.xml @@ -3,7 +3,7 @@ 4.0.0 com.alibaba druid - 1.1.11-preview_1 + 1.1.11-preview_6 jar druid @@ -16,8 +16,8 @@ 4.12 1.19 - true - true + false + false UTF-8 1.6 diff --git a/src/main/java/com/alibaba/druid/pool/DruidDataSource.java b/src/main/java/com/alibaba/druid/pool/DruidDataSource.java index 7475fbabb6..d50e769295 100644 --- a/src/main/java/com/alibaba/druid/pool/DruidDataSource.java +++ b/src/main/java/com/alibaba/druid/pool/DruidDataSource.java @@ -887,7 +887,7 @@ public class DruidDataSource extends DruidAbstractDataSource implements DruidDat initedTime = new Date(); registerMbean(); - if (connectError != null && poolingCount == 0 && !(initExceptionThrow && !asyncInit)) { + if (connectError != null && poolingCount == 0) { throw connectError; } diff --git a/src/test/java/com/alibaba/druid/bvt/pool/InitExceptionThrowTest.java b/src/test/java/com/alibaba/druid/bvt/pool/InitExceptionThrowTest.java index b5f9d0a627..1629fddf39 100644 --- a/src/test/java/com/alibaba/druid/bvt/pool/InitExceptionThrowTest.java +++ b/src/test/java/com/alibaba/druid/bvt/pool/InitExceptionThrowTest.java @@ -14,7 +14,7 @@ public class InitExceptionThrowTest extends TestClone { private int connectCount = 0; protected void setUp() throws Exception { - dataSource.setInitExceptionThrow(true); + dataSource.setInitExceptionThrow(false); dataSource.setUrl("jdbc:mock:xxx"); dataSource.setDriver(new MockDriver() { public Connection connect(String url, Properties info) throws SQLException {