Alawn/Druid
1
0
Fork 0
mirror of https://github.com/alibaba/druid.git synced 2023-03-04 19:17:16 +00:00
Code Issues Releases Wiki Activity

recover fatal error

Browse Source
This commit is contained in:
高铁
2019-08-20 20:30:13 +08:00
parent 6b9b189d41
commit 22e962b17c
2 changed files with 3 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
pom.xml
+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_06</version>
<version>1.1.20_preview_07</version>
<packaging>jar</packaging>
<name>druid</name>
src/main/java/com/alibaba/druid/pool/DruidDataSource.java
+2 -4
View File
@@ -1740,8 +1740,6 @@ public class DruidDataSource extends DruidAbstractDataSource implements DruidDat
sql = sql.substring(0, 1024);
}
DruidAbstractDataSource dataSource = holder.getDataSource();
boolean requireDiscard = false;
final ReentrantLock lock = conn.lock;
lock.lock();
@@ -1761,8 +1759,8 @@ public class DruidDataSource extends DruidAbstractDataSource implements DruidDat
lock.unlock();
}
if(dataSource != null) {
ReentrantLock dataSourceLock = dataSource.lock;
if(holder != null && holder.getDataSource() != null) {
ReentrantLock dataSourceLock = holder.getDataSource().lock;
dataSourceLock.lock();
try {
if (poolingCount < minIdle) {