bug fixed for initExceptionThrow

This commit is contained in:
wenshao
2018-08-22 18:06:03 +08:00
parent a40071a3cb
commit 14c151ba06
3 changed files with 5 additions and 5 deletions
+3 -3
View File
@@ -3,7 +3,7 @@
<modelVersion>4.0.0</modelVersion>
<groupId>com.alibaba</groupId>
<artifactId>druid</artifactId>
<version>1.1.11-preview_1</version>
<version>1.1.11-preview_6</version>
<packaging>jar</packaging>
<name>druid</name>
@@ -16,8 +16,8 @@
<junit.version>4.12</junit.version>
<jmh.version>1.19</jmh.version>
<gpg.skip>true</gpg.skip>
<javadoc.skip>true</javadoc.skip>
<gpg.skip>false</gpg.skip>
<javadoc.skip>false</javadoc.skip>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<jdk.version>1.6</jdk.version>
@@ -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;
}
@@ -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 {