From 0c47d2a38dba008e78a3672a25f52d2b70e4824b Mon Sep 17 00:00:00 2001 From: wenshao Date: Tue, 28 Aug 2012 09:19:28 +0800 Subject: [PATCH] test DruidDataSource testcase --- .../com/alibaba/druid/pool/DruidAbstractDataSource.java | 9 ++++----- .../com/alibaba/druid/bvt/pool/DruidDataSourceTest8.java | 2 ++ 2 files changed, 6 insertions(+), 5 deletions(-) diff --git a/src/main/java/com/alibaba/druid/pool/DruidAbstractDataSource.java b/src/main/java/com/alibaba/druid/pool/DruidAbstractDataSource.java index 844211f849..415cc131f2 100644 --- a/src/main/java/com/alibaba/druid/pool/DruidAbstractDataSource.java +++ b/src/main/java/com/alibaba/druid/pool/DruidAbstractDataSource.java @@ -1398,11 +1398,10 @@ public abstract class DruidAbstractDataSource extends WrapperAdapter implements } // 35 - 39 - map.put("ConnectionConnectCount", stat.getConnectionStat().getConnectCount()); - Throwable lastConnectionError = stat.getConnectionStat().getErrorLast(); - if (lastConnectionError != null) { - map.put("ConnectionErrorLastMessage", lastConnectionError.getMessage()); - map.put("ConnectionErrorLastStackTrace", IOUtils.getStackTrace(lastConnectionError)); + map.put("ConnectionConnectCount", createErrorCount); + if (createError != null) { + map.put("ConnectionErrorLastMessage", createError.getMessage()); + map.put("ConnectionErrorLastStackTrace", IOUtils.getStackTrace(createError)); } else { map.put("ConnectionErrorLastMessage", null); map.put("ConnectionErrorLastStackTrace", null); diff --git a/src/test/java/com/alibaba/druid/bvt/pool/DruidDataSourceTest8.java b/src/test/java/com/alibaba/druid/bvt/pool/DruidDataSourceTest8.java index 0ca88cbd78..ae8cbe7b84 100644 --- a/src/test/java/com/alibaba/druid/bvt/pool/DruidDataSourceTest8.java +++ b/src/test/java/com/alibaba/druid/bvt/pool/DruidDataSourceTest8.java @@ -43,6 +43,8 @@ public class DruidDataSourceTest8 extends TestCase { } Assert.assertNotNull(error); Assert.assertTrue(dataSource.getCreateErrorCount() > 0); + + dataSource.getCompositeData(); } }