diff --git a/src/main/java/com/alibaba/druid/pool/DruidConnectionHolder.java b/src/main/java/com/alibaba/druid/pool/DruidConnectionHolder.java index 035d52fdf6..46088b0fd2 100644 --- a/src/main/java/com/alibaba/druid/pool/DruidConnectionHolder.java +++ b/src/main/java/com/alibaba/druid/pool/DruidConnectionHolder.java @@ -215,10 +215,9 @@ public final class DruidConnectionHolder { buf.append("\""); } - PreparedStatementPool statmentPool = this.getStatementPool(); - if (statmentPool != null && statmentPool.getMap().size() > 0) { + if (statementPool != null && statementPool.getMap().size() > 0) { buf.append("\", CachedStatementCount:"); - buf.append(this.getStatementPool().getMap().size()); + buf.append(statementPool.getMap().size()); } buf.append("}"); diff --git a/src/test/java/com/alibaba/druid/bvt/pool/DruidConnectionHolderTest4.java b/src/test/java/com/alibaba/druid/bvt/pool/DruidConnectionHolderTest4.java new file mode 100644 index 0000000000..fefe89d08b --- /dev/null +++ b/src/test/java/com/alibaba/druid/bvt/pool/DruidConnectionHolderTest4.java @@ -0,0 +1,59 @@ +package com.alibaba.druid.bvt.pool; + +import java.lang.reflect.Field; +import java.sql.PreparedStatement; + +import junit.framework.TestCase; + +import org.junit.Assert; + +import com.alibaba.druid.pool.DruidConnectionHolder; +import com.alibaba.druid.pool.DruidDataSource; +import com.alibaba.druid.pool.DruidPooledConnection; + +public class DruidConnectionHolderTest4 extends TestCase { + + private DruidDataSource dataSource; + + protected void setUp() throws Exception { + dataSource = new DruidDataSource(); + dataSource.setUrl("jdbc:mock:xxx"); + dataSource.setTestOnBorrow(false); + dataSource.setPoolPreparedStatements(true); + + } + + protected void tearDown() throws Exception { + dataSource.close(); + } + + public void test_toString() throws Exception { + DruidPooledConnection conn = dataSource.getConnection(); + + DruidConnectionHolder holder = conn.getConnectionHolder(); + + Field field = DruidConnectionHolder.class.getDeclaredField("statementPool"); + field.setAccessible(true); + Assert.assertNull(field.get(holder)); + + holder.toString(); + + Assert.assertNull(field.get(holder)); + + holder.getStatementPool(); + + Assert.assertNotNull(field.get(holder)); + + holder.toString(); + + PreparedStatement stmt = conn.prepareStatement("select 1"); + stmt.execute(); + stmt.close(); + + conn.close(); + + Assert.assertEquals(1, holder.getStatementPool().size()); + + holder.toString(); + } +} diff --git a/src/test/java/com/alibaba/druid/bvt/pool/DruidDataSourceFactoryTest1.java b/src/test/java/com/alibaba/druid/bvt/pool/DruidDataSourceFactoryTest1.java index fa6a574fae..41508b1d54 100644 --- a/src/test/java/com/alibaba/druid/bvt/pool/DruidDataSourceFactoryTest1.java +++ b/src/test/java/com/alibaba/druid/bvt/pool/DruidDataSourceFactoryTest1.java @@ -160,4 +160,12 @@ public class DruidDataSourceFactoryTest1 extends TestCase { JdbcUtils.close(dataSource); } } + + public void test_getObjectInstance() throws Exception { + Assert.assertNull(new DruidDataSourceFactory().getObjectInstance(null, null, null, null)); + } + + public void test_getObjectInstance_1() throws Exception { + Assert.assertNull(new DruidDataSourceFactory().getObjectInstance(new Object(), null, null, null)); + } }