fixed shrink bypass checkTime bug

This commit is contained in:
agapple
2019-08-21 13:13:29 +08:00
parent 109f95be76
commit c2a8d3d7b2
2 changed files with 4 additions and 8 deletions
+1 -1
View File
@@ -3,7 +3,7 @@
<modelVersion>4.0.0</modelVersion>
<groupId>com.alibaba</groupId>
<artifactId>druid</artifactId>
<version>1.1.20_preview_09</version>
<version>1.1.20_preview_10</version>
<packaging>jar</packaging>
<name>druid</name>
@@ -2998,13 +2998,9 @@ public class DruidDataSource extends DruidAbstractDataSource implements DruidDat
for (int i = 0; i < poolingCount; ++i) {
DruidConnectionHolder connection = connections[i];
if (onFatalError || fatalErrorIncrement > 0) {
if (lastFatalErrorTimeMillis > connection.connectTimeMillis) {
keepAliveConnections[keepAliveCount++] = connection;
continue;
} else {
break;
}
if ((onFatalError || fatalErrorIncrement > 0) && (lastFatalErrorTimeMillis > connection.connectTimeMillis)) {
keepAliveConnections[keepAliveCount++] = connection;
continue;
}
if (checkTime) {