From c1506138263a764f4aad106300cf87930a5a4418 Mon Sep 17 00:00:00 2001 From: wenshao Date: Fri, 2 Sep 2011 18:54:24 +0000 Subject: [PATCH] git-svn-id: http://code.alibabatech.com/svn/druid/trunk@605 b9813039-fb51-4c41-a8b9-e21c2acb5095 --- src/main/java/com/alibaba/druid/pool/DruidDataSource.java | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/src/main/java/com/alibaba/druid/pool/DruidDataSource.java b/src/main/java/com/alibaba/druid/pool/DruidDataSource.java index 13bfba04a6..40318d6f48 100644 --- a/src/main/java/com/alibaba/druid/pool/DruidDataSource.java +++ b/src/main/java/com/alibaba/druid/pool/DruidDataSource.java @@ -426,7 +426,9 @@ public class DruidDataSource extends DruidAbstractDataSource implements DruidDat JdbcUtils.close(conn); throw new SQLException(e.getMessage(), e); - } catch (SQLException e) { + } catch (Exception e) { + JdbcUtils.close(conn); + lock.lock(); try { decrementActiveCount(); @@ -435,9 +437,7 @@ public class DruidDataSource extends DruidAbstractDataSource implements DruidDat lock.unlock(); } - JdbcUtils.close(conn); - - throw e; + throw new SQLException("recyle error", e); } }