mirror of
https://github.com/alibaba/druid.git
synced 2023-03-04 19:17:16 +00:00
删除多余代码
git-svn-id: http://code.alibabatech.com/svn/druid/trunk@641 b9813039-fb51-4c41-a8b9-e21c2acb5095
This commit is contained in:
@@ -429,12 +429,13 @@ public class DruidDataSource extends DruidAbstractDataSource implements DruidDat
|
||||
if (isTestOnReturn()) {
|
||||
boolean validate = testConnectionInternal(conn);
|
||||
if (!validate) {
|
||||
JdbcUtils.close(conn);
|
||||
|
||||
lock.lockInterruptibly();
|
||||
try {
|
||||
JdbcUtils.close(conn);
|
||||
destroyCount++;
|
||||
closeCount++;
|
||||
activeCount--;
|
||||
closeCount++;
|
||||
} finally {
|
||||
lock.unlock();
|
||||
}
|
||||
@@ -511,10 +512,6 @@ public class DruidDataSource extends DruidAbstractDataSource implements DruidDat
|
||||
}
|
||||
|
||||
void putLast(ConnectionHolder e) throws SQLException {
|
||||
if (e == null) {
|
||||
throw new NullPointerException();
|
||||
}
|
||||
|
||||
if (!enable) {
|
||||
discardConnection(e.getConnection());
|
||||
return;
|
||||
|
||||
Reference in New Issue
Block a user