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

使用lockInterruptibly

Browse Source 
git-svn-id: http://code.alibabatech.com/svn/druid/trunk@626 b9813039-fb51-4c41-a8b9-e21c2acb5095
This commit is contained in:
wenshao
2011-09-04 11:09:47 +00:00
parent 533f24d077
commit 7941b58510
1 changed files with 16 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/main/java/com/alibaba/druid/pool/DruidDataSource.java
+16 -6
View File
@@ -384,7 +384,7 @@ public class DruidDataSource extends DruidAbstractDataSource implements DruidDat
try {
// 第一步，检查连接是否关闭
if (conn == null || conn.isClosed()) {
lock.lock();
lock.lockInterruptibly();
try {
activeCount--;
closeCount++;
@@ -411,7 +411,7 @@ public class DruidDataSource extends DruidAbstractDataSource implements DruidDat
if (isTestOnReturn()) {
boolean validate = testConnectionInternal(conn);
if (!validate) {
lock.lock();
lock.lockInterruptibly();
try {
JdbcUtils.close(conn);
destroyCount++;
@@ -425,7 +425,7 @@ public class DruidDataSource extends DruidAbstractDataSource implements DruidDat
holder.setLastCheckTimeMillis(System.currentTimeMillis());
}
lock.lock();
lock.lockInterruptibly();
try {
activeCount--;
closeCount++;
@@ -439,7 +439,12 @@ public class DruidDataSource extends DruidAbstractDataSource implements DruidDat
} catch (Throwable e) {
JdbcUtils.close(conn);
lock.lock();
try {
lock.lockInterruptibly();
} catch (InterruptedException interruptEx) {
throw new SQLException("interrupt", interruptEx);
}
try {
activeCount--;
closeCount++;
@@ -485,8 +490,13 @@ public class DruidDataSource extends DruidAbstractDataSource implements DruidDat
createConnectionCount++;
}
void decrementActiveCountWithLock() {
lock.lock();
void decrementActiveCountWithLock() throws SQLException {
try {
lock.lockInterruptibly();
} catch (InterruptedException e) {
throw new SQLException("interrupt", e);
}
try {
activeCount--;
} finally {