From c2a8d3d7b24115c87550bad919d10aefea8f43fd Mon Sep 17 00:00:00 2001
From: agapple <jianghang115@gmail.com>
Date: Wed, 21 Aug 2019 13:13:29 +0800
Subject: [PATCH] fixed shrink bypass checkTime bug

---
 pom.xml                                                |  2 +-
 .../java/com/alibaba/druid/pool/DruidDataSource.java   | 10 +++-------
 2 files changed, 4 insertions(+), 8 deletions(-)

diff --git a/pom.xml b/pom.xml
index 8065fb534b..34ef5dcb7a 100644
--- a/pom.xml
+++ b/pom.xml
@@ -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>
diff --git a/src/main/java/com/alibaba/druid/pool/DruidDataSource.java b/src/main/java/com/alibaba/druid/pool/DruidDataSource.java
index 12f7ddbe04..2e355b1de7 100644
--- a/src/main/java/com/alibaba/druid/pool/DruidDataSource.java
+++ b/src/main/java/com/alibaba/druid/pool/DruidDataSource.java
@@ -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) {