diff --git a/src/main/java/com/alibaba/druid/pool/DruidDataSource.java b/src/main/java/com/alibaba/druid/pool/DruidDataSource.java index 87e6d120be..c89bacbdf5 100644 --- a/src/main/java/com/alibaba/druid/pool/DruidDataSource.java +++ b/src/main/java/com/alibaba/druid/pool/DruidDataSource.java @@ -316,6 +316,17 @@ public class DruidDataSource extends DruidAbstractDataSource implements DruidDat } } } + { + String property = properties.getProperty("druid.maxWait"); + if (property != null && property.length() > 0) { + try { + int value = Integer.parseInt(property); + this.setMaxWait(value); + } catch (NumberFormatException e) { + LOG.error("illegal property 'druid.maxWait'", e); + } + } + } { Boolean value = getBoolean(properties, "druid.failFast"); if (value != null) { @@ -1519,6 +1530,10 @@ public class DruidDataSource extends DruidAbstractDataSource implements DruidDat } } + if (createErrorCount > 0) { + buf.append(", createErrorCount ").append(createErrorCount); + } + List sqlList = this.getDataSourceStat().getRuningSqlList(); for (int i = 0; i < sqlList.size(); ++i) { if (i != 0) { diff --git a/src/main/java/com/alibaba/druid/pool/DruidPooledConnection.java b/src/main/java/com/alibaba/druid/pool/DruidPooledConnection.java index 98d9679c28..2276983b38 100644 --- a/src/main/java/com/alibaba/druid/pool/DruidPooledConnection.java +++ b/src/main/java/com/alibaba/druid/pool/DruidPooledConnection.java @@ -1150,14 +1150,6 @@ public class DruidPooledConnection extends PoolableWrapper implements javax.sql. } private void checkStateInternal() throws SQLException { - if (holder == null) { - if (disableError != null) { - throw new SQLException("connection holder is null", disableError); - } else { - throw new SQLException("connection holder is null"); - } - } - if (closed) { if (disableError != null) { throw new SQLException("connection closed", disableError); @@ -1173,6 +1165,14 @@ public class DruidPooledConnection extends PoolableWrapper implements javax.sql. throw new SQLException("connection disabled"); } } + + if (holder == null) { + if (disableError != null) { + throw new SQLException("connection holder is null", disableError); + } else { + throw new SQLException("connection holder is null"); + } + } } public String toString() {