From a7f4299a4bb566d07a898dcadef2dd8c6eaa07eb Mon Sep 17 00:00:00 2001
From: wenshao <szujobs@hotmail.com>
Date: Tue, 27 Sep 2011 09:13:12 +0000
Subject: [PATCH] =?UTF-8?q?=E5=A2=9E=E5=BC=BA=E7=9B=91=E6=8E=A7?=
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@911 b9813039-fb51-4c41-a8b9-e21c2acb5095
---
 .../com/alibaba/druid/stat/DruidDataSourceStatManager.java   | 5 +++--
 .../alibaba/druid/bvt/pool/DruidDataSourceFilterTest.java    | 2 ++
 2 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/src/main/java/com/alibaba/druid/stat/DruidDataSourceStatManager.java b/src/main/java/com/alibaba/druid/stat/DruidDataSourceStatManager.java
index fb751e9307..802db7e7e7 100644
--- a/src/main/java/com/alibaba/druid/stat/DruidDataSourceStatManager.java
+++ b/src/main/java/com/alibaba/druid/stat/DruidDataSourceStatManager.java
@@ -170,6 +170,7 @@ public class DruidDataSourceStatManager implements DruidDataSourceStatManagerMBe
 
         map.put("NotEmptyWaitCount", dataSource.getNotEmptyWaitCount());
         map.put("NotEmptyWaitNanos", dataSource.getNotEmptyWaitNanos());
+        map.put("ErrorCount", dataSource.getErrorCount());
 
         return new CompositeDataSupport(rowType, map);
     }
@@ -189,7 +190,7 @@ public class DruidDataSourceStatManager implements DruidDataSourceStatManagerMBe
                 SimpleType.INTEGER, SimpleType.INTEGER, SimpleType.INTEGER, SimpleType.BOOLEAN, SimpleType.BOOLEAN, //
                 SimpleType.BOOLEAN, SimpleType.LONG, SimpleType.LONG, SimpleType.LONG, SimpleType.STRING, //
                 SimpleType.STRING, SimpleType.INTEGER, SimpleType.STRING, SimpleType.STRING, SimpleType.LONG, //
-                SimpleType.LONG, SimpleType.LONG,
+                SimpleType.LONG, SimpleType.LONG, SimpleType.LONG,
         //
         };
 
@@ -200,7 +201,7 @@ public class DruidDataSourceStatManager implements DruidDataSourceStatManagerMBe
                 "InitialSize", "MaxActive", "MinIdle", "PoolPreparedStatements", "TestOnBorrow", //
                 "TestOnReturn", "MinEvictableIdleTimeMillis", "ConnectErrorCount", "CreateTimespanMillis", "DbType", //
                 "ValidationQuery", "ValidationQueryTimeout", "DriverClassName", "Username", "RemoveAbandonedCount", //
-                "NotEmptyWaitCount", "NotEmptyWaitNanos"
+                "NotEmptyWaitCount", "NotEmptyWaitNanos", "ErrorCount"
         //
         };
 
diff --git a/src/test/java/com/alibaba/druid/bvt/pool/DruidDataSourceFilterTest.java b/src/test/java/com/alibaba/druid/bvt/pool/DruidDataSourceFilterTest.java
index f60de20466..d472e852e2 100644
--- a/src/test/java/com/alibaba/druid/bvt/pool/DruidDataSourceFilterTest.java
+++ b/src/test/java/com/alibaba/druid/bvt/pool/DruidDataSourceFilterTest.java
@@ -67,6 +67,8 @@ public class DruidDataSourceFilterTest extends TestCase {
             Assert.assertEquals(0, JdbcStatManager.getInstance().getConnectionstat().getCloseCount()); // logic
                                                                                                        // close不会导致计数器＋1
         }
+        
+        Assert.assertEquals(1, DruidDataSourceStatManager.getInstance().getDataSourceList().size()); 
 
         dataSource.close();