recover fatal error

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
@@ -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) {