From ca55412bd5c0d78761f499080c7f5753acadc84a Mon Sep 17 00:00:00 2001 From: wenshao Date: Wed, 6 Jul 2011 14:32:12 +0000 Subject: [PATCH] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=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@354 b9813039-fb51-4c41-a8b9-e21c2acb5095 --- .../alibaba/druid/pool/DruidDataSource.java | 7 ++++- .../druid/pool/DruidDataSourceMBean.java | 2 ++ .../druid/bvt/pool/ManagedDataSourceTest.java | 26 +++++++++++++++++++ 3 files changed, 34 insertions(+), 1 deletion(-) create mode 100644 src/test/java/com/alibaba/druid/bvt/pool/ManagedDataSourceTest.java diff --git a/src/main/java/com/alibaba/druid/pool/DruidDataSource.java b/src/main/java/com/alibaba/druid/pool/DruidDataSource.java index e20604f5fc..a504ed7170 100644 --- a/src/main/java/com/alibaba/druid/pool/DruidDataSource.java +++ b/src/main/java/com/alibaba/druid/pool/DruidDataSource.java @@ -98,7 +98,7 @@ public class DruidDataSource extends DruidAbstractDataSource implements DruidDat private long id; private Date createdTime; - private boolean enable; + private boolean enable = true; public DruidDataSource(){ } @@ -1049,4 +1049,9 @@ public class DruidDataSource extends DruidAbstractDataSource implements DruidDat return new CompositeDataSupport(JdbcStatManager.getDataSourceCompositeType(), map); } + + @Override + public void shrink() { + throw new UnsupportedOperationException(); + } } diff --git a/src/main/java/com/alibaba/druid/pool/DruidDataSourceMBean.java b/src/main/java/com/alibaba/druid/pool/DruidDataSourceMBean.java index 53b4df427f..5e8f554058 100644 --- a/src/main/java/com/alibaba/druid/pool/DruidDataSourceMBean.java +++ b/src/main/java/com/alibaba/druid/pool/DruidDataSourceMBean.java @@ -23,4 +23,6 @@ public interface DruidDataSourceMBean extends DruidAbstractDataSourceMBean { boolean isEnable(); void setEnable(boolean enable); + + void shrink(); } diff --git a/src/test/java/com/alibaba/druid/bvt/pool/ManagedDataSourceTest.java b/src/test/java/com/alibaba/druid/bvt/pool/ManagedDataSourceTest.java new file mode 100644 index 0000000000..ae179296a8 --- /dev/null +++ b/src/test/java/com/alibaba/druid/bvt/pool/ManagedDataSourceTest.java @@ -0,0 +1,26 @@ +package com.alibaba.druid.bvt.pool; + +import java.sql.Connection; + +import junit.framework.TestCase; + +import com.alibaba.druid.pool.DruidDataSource; + +public class ManagedDataSourceTest extends TestCase { + + private DruidDataSource dataSource; + + public void setUp() throws Exception { + dataSource = new DruidDataSource(); + dataSource.setUrl("jdbc:mock:xxx"); + } + + public void tearDown() throws Exception { + dataSource.close(); + } + + public void test_managed() throws Exception { + Connection conn = dataSource.getConnection(); + conn.close(); + } +}