From e54ab12ddbabbe97bd37897a3ef5599c20088ff4 Mon Sep 17 00:00:00 2001
From: wenshao <szujobs@hotmail.com>
Date: Tue, 12 Jul 2011 08:28:51 +0000
Subject: [PATCH] =?UTF-8?q?=E5=88=A0=E9=99=A4=E9=87=8D=E5=A4=8D=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@377 b9813039-fb51-4c41-a8b9-e21c2acb5095
---
 .../druid/pool/DruidAbstractDataSource.java   | 19 ++++---------------
 .../alibaba/druid/pool/benckmark/Case3.java   |  2 +-
 2 files changed, 5 insertions(+), 16 deletions(-)

diff --git a/src/main/java/com/alibaba/druid/pool/DruidAbstractDataSource.java b/src/main/java/com/alibaba/druid/pool/DruidAbstractDataSource.java
index e340425e9a..ae79df2b89 100644
--- a/src/main/java/com/alibaba/druid/pool/DruidAbstractDataSource.java
+++ b/src/main/java/com/alibaba/druid/pool/DruidAbstractDataSource.java
@@ -40,6 +40,7 @@ import com.alibaba.druid.filter.Filter;
 import com.alibaba.druid.filter.FilterChainImpl;
 import com.alibaba.druid.proxy.jdbc.DataSourceProxy;
 import com.alibaba.druid.util.DruidLoaderUtils;
+import com.alibaba.druid.util.JdbcUtils;
 
 /**
  * @author wenshao<szujobs@hotmail.com>
@@ -649,7 +650,7 @@ public abstract class DruidAbstractDataSource implements DruidAbstractDataSource
     public void setExceptionSorterClassName(String exceptionSorter) throws Exception {
         this.setExceptionSoter(exceptionSorter);
     }
-    
+
     public void setExceptionSoter(String exceptionSorter) throws Exception {
         if (exceptionSorter == null) {
             this.exceptionSoter = null;
@@ -753,20 +754,8 @@ public abstract class DruidAbstractDataSource implements DruidAbstractDataSource
                     return false;
                 }
             } finally {
-                if (rset != null) {
-                    try {
-                        rset.close();
-                    } catch (Exception t) {
-                        // ignored
-                    }
-                }
-                if (stmt != null) {
-                    try {
-                        stmt.close();
-                    } catch (Exception t) {
-                        // ignored
-                    }
-                }
+                JdbcUtils.close(rset);
+                JdbcUtils.close(stmt);
             }
 
             return true;
diff --git a/src/test/java/com/alibaba/druid/pool/benckmark/Case3.java b/src/test/java/com/alibaba/druid/pool/benckmark/Case3.java
index 071e65397e..55bddcfab7 100644
--- a/src/test/java/com/alibaba/druid/pool/benckmark/Case3.java
+++ b/src/test/java/com/alibaba/druid/pool/benckmark/Case3.java
@@ -26,7 +26,7 @@ public class Case3 extends TestCase {
     private int     threadCount     = 40;
     private int     TEST_COUNT       = 3;
     final int       LOOP_COUNT      = 1000 * 100;
-    private boolean testOnBorrow    = false;
+    private boolean testOnBorrow    = true;
 
     protected void setUp() throws Exception {
 //        jdbcUrl = "jdbc:fake:dragoon_v25masterdb";