bug fixed for keepAlive

This commit is contained in:
shaojin.wensj
2019-02-26 11:09:47 +08:00
parent f8f928601a
commit d5003ee294
3 changed files with 13 additions and 2 deletions
+1
View File
@@ -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/
+8 -2
View File
@@ -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>
@@ -2939,6 +2939,10 @@ public class DruidDataSource extends DruidAbstractDataSource implements DruidDat
lock.lock();
try {
discardCount++;
if (activeCount <= minIdle) {
emptySignal();
}
} finally {
lock.unlock();
}