From 2735189e675afe9e6854bbb3d92e6890ff9c7366 Mon Sep 17 00:00:00 2001
From: wenshao <szujobs@hotmail.com>
Date: Sat, 3 Sep 2011 12:42:07 +0000
Subject: [PATCH] =?UTF-8?q?=E7=B2=BE=E7=AE=80=E4=BB=A3=E7=A0=81?=
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@624 b9813039-fb51-4c41-a8b9-e21c2acb5095
---
 .../com/alibaba/druid/pool/DruidDataSource.java    | 14 +++++---------
 1 file changed, 5 insertions(+), 9 deletions(-)

diff --git a/src/main/java/com/alibaba/druid/pool/DruidDataSource.java b/src/main/java/com/alibaba/druid/pool/DruidDataSource.java
index d363ead472..2f516c133c 100644
--- a/src/main/java/com/alibaba/druid/pool/DruidDataSource.java
+++ b/src/main/java/com/alibaba/druid/pool/DruidDataSource.java
@@ -376,7 +376,7 @@ public class DruidDataSource extends DruidAbstractDataSource implements DruidDat
             if (conn == null || conn.isClosed()) {
                 lock.lock();
                 try {
-                    decrementActiveCount();
+                    activeCount--;
                     closeCount++;
                 } finally {
                     lock.unlock();
@@ -406,7 +406,7 @@ public class DruidDataSource extends DruidAbstractDataSource implements DruidDat
                         JdbcUtils.close(conn);
                         destroyCount++;
                         closeCount++;
-                        decrementActiveCount();
+                        activeCount--;
                     } finally {
                         lock.unlock();
                     }
@@ -417,7 +417,7 @@ public class DruidDataSource extends DruidAbstractDataSource implements DruidDat
 
             lock.lock();
             try {
-                decrementActiveCount();
+                activeCount--;
                 closeCount++;
 
                 // 第六步，加入队列中(putLast)
@@ -431,7 +431,7 @@ public class DruidDataSource extends DruidAbstractDataSource implements DruidDat
 
             lock.lock();
             try {
-                decrementActiveCount();
+                activeCount--;
                 closeCount++;
             } finally {
                 lock.unlock();
@@ -475,14 +475,10 @@ public class DruidDataSource extends DruidAbstractDataSource implements DruidDat
         createConnectionCount++;
     }
 
-    void decrementActiveCount() {
-        activeCount--;
-    }
-
     void decrementActiveCountWithLock() {
         lock.lock();
         try {
-            decrementActiveCount();
+            activeCount--;
         } finally {
             lock.unlock();
         }