From 2aca70ead95e96be86f595a4f059abc0abe8d2cf Mon Sep 17 00:00:00 2001 From: wenshao Date: Fri, 16 Sep 2011 14:33:01 +0000 Subject: [PATCH] =?UTF-8?q?=E5=AE=8C=E5=96=84=E6=B5=8B=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@822 b9813039-fb51-4c41-a8b9-e21c2acb5095 --- .../alibaba/druid/pool/ConnectionHolder.java | 29 +------------------ .../druid/bvt/pool/basic/ConnectionTest4.java | 6 ++++ 2 files changed, 7 insertions(+), 28 deletions(-) diff --git a/src/main/java/com/alibaba/druid/pool/ConnectionHolder.java b/src/main/java/com/alibaba/druid/pool/ConnectionHolder.java index ab2cb80d0b..9f8cf29033 100644 --- a/src/main/java/com/alibaba/druid/pool/ConnectionHolder.java +++ b/src/main/java/com/alibaba/druid/pool/ConnectionHolder.java @@ -16,7 +16,6 @@ package com.alibaba.druid.pool; import java.sql.Connection; -import java.sql.SQLException; import java.sql.Statement; import java.util.ArrayList; import java.util.Date; @@ -24,7 +23,6 @@ import java.util.List; import java.util.concurrent.CopyOnWriteArrayList; import javax.sql.ConnectionEventListener; -import javax.sql.PooledConnection; import javax.sql.StatementEventListener; import com.alibaba.druid.util.JdbcUtils; @@ -32,7 +30,7 @@ import com.alibaba.druid.util.JdbcUtils; /** * @author wenshao */ -public final class ConnectionHolder implements PooledConnection { +public final class ConnectionHolder { private final DruidAbstractDataSource dataSource; private final Connection conn; @@ -151,29 +149,4 @@ public final class ConnectionHolder implements PooledConnection { return buf.toString(); } - @Override - public void close() throws SQLException { - this.reset(); - JdbcUtils.close(this.conn); - } - - @Override - public void addConnectionEventListener(ConnectionEventListener listener) { - connectionEventListeners.add(listener); - } - - @Override - public void removeConnectionEventListener(ConnectionEventListener listener) { - connectionEventListeners.remove(listener); - } - - @Override - public void addStatementEventListener(StatementEventListener listener) { - statementEventListeners.add(listener); - } - - @Override - public void removeStatementEventListener(StatementEventListener listener) { - statementEventListeners.remove(listener); - } } diff --git a/src/test/java/com/alibaba/druid/bvt/pool/basic/ConnectionTest4.java b/src/test/java/com/alibaba/druid/bvt/pool/basic/ConnectionTest4.java index 829a302b35..a987a8b845 100644 --- a/src/test/java/com/alibaba/druid/bvt/pool/basic/ConnectionTest4.java +++ b/src/test/java/com/alibaba/druid/bvt/pool/basic/ConnectionTest4.java @@ -397,6 +397,12 @@ public class ConnectionTest4 extends TestCase { stmt.close(); } + conn.getConnectionHolder().toString(); + conn.getConnectionHolder().setLastActiveTimeMillis(0); + conn.getConnectionHolder().toString(); + conn.getConnectionHolder().getUseCount(); + conn.getConnectionHolder().getTimeMillis(); + conn.close(); }