From 2079c3da709a3df21130b60108a461abf1a32a85 Mon Sep 17 00:00:00 2001
From: wenshao <szujobs@hotmail.com>
Date: Mon, 5 Sep 2011 06:31:14 +0000
Subject: [PATCH] =?UTF-8?q?=E5=88=A0=E9=99=A4=E5=A4=9A=E4=BD=99=E4=BB=A3?=
 =?UTF-8?q?=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@641 b9813039-fb51-4c41-a8b9-e21c2acb5095
---
 .../java/com/alibaba/druid/pool/DruidDataSource.java     | 9 +++------
 1 file changed, 3 insertions(+), 6 deletions(-)

diff --git a/src/main/java/com/alibaba/druid/pool/DruidDataSource.java b/src/main/java/com/alibaba/druid/pool/DruidDataSource.java
index c45965d8eb..ea5b0fac13 100644
--- a/src/main/java/com/alibaba/druid/pool/DruidDataSource.java
+++ b/src/main/java/com/alibaba/druid/pool/DruidDataSource.java
@@ -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;