From 5e1c3238a4a080a4bac6c280639d102322811924 Mon Sep 17 00:00:00 2001 From: wenshao Date: Sun, 18 Sep 2011 03:43:22 +0000 Subject: [PATCH] =?UTF-8?q?=E5=AE=8C=E5=96=84mock=E5=92=8C=E6=B5=8B?= =?UTF-8?q?=E8=AF=95?= 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@831 b9813039-fb51-4c41-a8b9-e21c2acb5095 --- .../java/com/alibaba/druid/pool/PoolableConnection.java | 6 ++---- .../com/alibaba/druid/bvt/pool/basic/ConnectionTest5.java | 3 +-- 2 files changed, 3 insertions(+), 6 deletions(-) diff --git a/src/main/java/com/alibaba/druid/pool/PoolableConnection.java b/src/main/java/com/alibaba/druid/pool/PoolableConnection.java index da227e1335..7c6658a325 100644 --- a/src/main/java/com/alibaba/druid/pool/PoolableConnection.java +++ b/src/main/java/com/alibaba/druid/pool/PoolableConnection.java @@ -66,9 +66,7 @@ public class PoolableConnection implements PooledConnection, Connection { // if (holder != null) { DruidAbstractDataSource dataSource = holder.getDataSource(); - if (dataSource != null) { - holder.getDataSource().handleConnectionException(this, t); - } + dataSource.handleConnectionException(this, t); } if (t instanceof SQLException) { @@ -86,7 +84,7 @@ public class PoolableConnection implements PooledConnection, Connection { } catch (SQLException ex) { LOG.error("clear parameter error", ex); } - + if (holder.isPoolPreparedStatements()) { this.holder.getStatementPool().put(stmt); stmt.clearResultSet(); diff --git a/src/test/java/com/alibaba/druid/bvt/pool/basic/ConnectionTest5.java b/src/test/java/com/alibaba/druid/bvt/pool/basic/ConnectionTest5.java index aa60e5b07e..d12a341a43 100644 --- a/src/test/java/com/alibaba/druid/bvt/pool/basic/ConnectionTest5.java +++ b/src/test/java/com/alibaba/druid/bvt/pool/basic/ConnectionTest5.java @@ -147,7 +147,7 @@ public class ConnectionTest5 extends TestCase { } }); - conn.getConnection().close(); + conn.close(); { SQLException error = null; @@ -159,7 +159,6 @@ public class ConnectionTest5 extends TestCase { Assert.assertNotNull(error); } - conn.close(); }