From 2af748f7bef6159ce976b800ed1d1d0a6c7bb1e9 Mon Sep 17 00:00:00 2001
From: wenshao <szujobs@hotmail.com>
Date: Fri, 2 Sep 2011 02:18:51 +0000
Subject: [PATCH] =?UTF-8?q?=E4=BD=BF=E7=94=A8lock.lock()=E4=BB=A3=E6=9B=BF?=
 =?UTF-8?q?lock.lockInterruptibly()?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

git-svn-id: http://code.alibabatech.com/svn/druid/trunk@558 b9813039-fb51-4c41-a8b9-e21c2acb5095
---
 src/main/java/com/alibaba/druid/pool/DruidDataSource.java | 8 +++-----
 1 file changed, 3 insertions(+), 5 deletions(-)

diff --git a/src/main/java/com/alibaba/druid/pool/DruidDataSource.java b/src/main/java/com/alibaba/druid/pool/DruidDataSource.java
index dd0a3ff7df..e667ddb387 100644
--- a/src/main/java/com/alibaba/druid/pool/DruidDataSource.java
+++ b/src/main/java/com/alibaba/druid/pool/DruidDataSource.java
@@ -120,9 +120,8 @@ public class DruidDataSource extends DruidAbstractDataSource implements DruidDat
             return;
         }
 
+        lock.lock();
         try {
-            lock.lockInterruptibly();
-
             if (inited) {
                 return;
             }
@@ -315,9 +314,8 @@ public class DruidDataSource extends DruidAbstractDataSource implements DruidDat
             throw new DataSourceDisableException();
         }
 
+        lock.lock();
         try {
-            lock.lockInterruptibly();
-
             connectCount++;
 
             if (!enable) {
@@ -423,7 +421,7 @@ public class DruidDataSource extends DruidAbstractDataSource implements DruidDat
                 holder.setLastCheckTimeMillis(System.currentTimeMillis());
             }
 
-            lock.lockInterruptibly();
+            lock.lock();
             try {
                 decrementActiveCount();
                 closeCount++;