From 35cb2f42bada302a5ecbe6eabee29cb426418be4 Mon Sep 17 00:00:00 2001
From: wenshao <szujobs@hotmail.com>
Date: Mon, 27 Aug 2012 15:29:28 +0800
Subject: [PATCH 1/2] format code

---
 src/main/java/com/alibaba/druid/pool/DruidDataSource.java | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/main/java/com/alibaba/druid/pool/DruidDataSource.java b/src/main/java/com/alibaba/druid/pool/DruidDataSource.java
index 63b77a6138..1cf4b9df79 100644
--- a/src/main/java/com/alibaba/druid/pool/DruidDataSource.java
+++ b/src/main/java/com/alibaba/druid/pool/DruidDataSource.java
@@ -677,10 +677,10 @@ public class DruidDataSource extends DruidAbstractDataSource implements DruidDat
             connectErrorCount.incrementAndGet();
             throw new DataSourceDisableException();
         }
-        
+
         final long nanos = TimeUnit.MILLISECONDS.toNanos(maxWait);
         final int maxWaitThreadCount = getMaxWaitThreadCount();
-        
+
         DruidConnectionHolder holder;
         try {
             lock.lockInterruptibly();

From d7e89ae1347faf9feb3aa4b1add3ec4244c28ab6 Mon Sep 17 00:00:00 2001
From: wenshao <szujobs@hotmail.com>
Date: Mon, 27 Aug 2012 15:52:55 +0800
Subject: [PATCH 2/2] =?UTF-8?q?=E7=BC=A9=E5=B0=8F=E9=94=81=E8=8C=83?=
 =?UTF-8?q?=E5=9B=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../java/com/alibaba/druid/pool/DruidDataSource.java   | 10 +++++-----
 1 file changed, 5 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 1cf4b9df79..ab3eccbbbb 100644
--- a/src/main/java/com/alibaba/druid/pool/DruidDataSource.java
+++ b/src/main/java/com/alibaba/druid/pool/DruidDataSource.java
@@ -811,6 +811,11 @@ public class DruidDataSource extends DruidAbstractDataSource implements DruidDat
                 }
             }
 
+            if (!enable) {
+                discardConnection(holder.getConnection());
+                return;
+            }
+            
             final long lastActiveTimeMillis = System.currentTimeMillis();
             lock.lockInterruptibly();
             try {
@@ -916,11 +921,6 @@ public class DruidDataSource extends DruidAbstractDataSource implements DruidDat
     }
 
     void putLast(DruidConnectionHolder e, long lastActiveTimeMillis) throws SQLException {
-        if (!enable) {
-            discardConnection(e.getConnection());
-            return;
-        }
-
         e.setLastActiveTimeMillis(lastActiveTimeMillis);
         connections[poolingCount++] = e;