From d5003ee29446f26647c1a0d73bddb27933bf0421 Mon Sep 17 00:00:00 2001
From: "shaojin.wensj" <shaojin.wensj@alibaba-inc.com>
Date: Tue, 26 Feb 2019 11:09:47 +0800
Subject: [PATCH] bug fixed for keepAlive

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

diff --git a/.gitignore b/.gitignore
index beb91a21b0..d618f6f455 100644
--- a/.gitignore
+++ b/.gitignore
@@ -7,6 +7,7 @@
 /derby.log
 /src/test/resources/pool_config
 /src/test/java/com/alibaba/druid/local_test
+/src/test/java/com/alibaba/druid/pool/mysql/
 # IntelliJ Idea
 .idea/
 out/
diff --git a/pom.xml b/pom.xml
index 8e125a1db1..f746aa6f3d 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.14-preview_1</version>
+	<version>1.1.14-preview_2</version>
 
 	<packaging>jar</packaging>
 	<name>druid</name>
@@ -463,7 +463,7 @@
 		<dependency>
 			<groupId>mysql</groupId>
 			<artifactId>mysql-connector-java</artifactId>
-			<version>5.1.45</version>
+			<version>6.0.2</version>
 			<scope>provided</scope>
 		</dependency>
 		<dependency>
@@ -729,6 +729,12 @@
 			<version>${jmh.version}</version>
 			<scope>test</scope>
 		</dependency>
+		<dependency>
+			<groupId>org.mariadb.jdbc</groupId>
+			<artifactId>mariadb-java-client</artifactId>
+			<version>2.4.0</version>
+			<scope>test</scope>
+		</dependency>
 
 	</dependencies>
 </project>
diff --git a/src/main/java/com/alibaba/druid/pool/DruidDataSource.java b/src/main/java/com/alibaba/druid/pool/DruidDataSource.java
index 94043cf64f..862872f0a1 100644
--- a/src/main/java/com/alibaba/druid/pool/DruidDataSource.java
+++ b/src/main/java/com/alibaba/druid/pool/DruidDataSource.java
@@ -2939,6 +2939,10 @@ public class DruidDataSource extends DruidAbstractDataSource implements DruidDat
                     lock.lock();
                     try {
                         discardCount++;
+
+                        if (activeCount <= minIdle) {
+                            emptySignal();
+                        }
                     } finally {
                         lock.unlock();
                     }