From 2b1c21d27e4d7bb2102c9eb51f17360e8052a5d2 Mon Sep 17 00:00:00 2001
From: wenshao <szujobs@hotmail.com>
Date: Sat, 28 May 2011 07:33:19 +0000
Subject: [PATCH] =?UTF-8?q?=E5=88=A0=E9=99=A4=E5=A4=9A=E4=BD=99=E4=BB=A3?=
 =?UTF-8?q?=E7=A0=81?=
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@208 b9813039-fb51-4c41-a8b9-e21c2acb5095
---
 .../java/com/alibaba/druid/filter/stat/StatFilter.java |  5 +++--
 .../com/alibaba/druid/stat/JdbcDataSourceStat.java     | 10 +++-------
 .../java/com/alibaba/druid/stat/JdbcStatManager.java   |  2 +-
 3 files changed, 7 insertions(+), 10 deletions(-)

diff --git a/src/main/java/com/alibaba/druid/filter/stat/StatFilter.java b/src/main/java/com/alibaba/druid/filter/stat/StatFilter.java
index 5a8ed9eaf5..7e6086e4dc 100644
--- a/src/main/java/com/alibaba/druid/filter/stat/StatFilter.java
+++ b/src/main/java/com/alibaba/druid/filter/stat/StatFilter.java
@@ -613,7 +613,8 @@ public class StatFilter extends FilterEventAdapter implements StatFilterMBean {
     }
 
     public final JdbcSqlStat createSqlStat(StatementProxy statement, String sql) {
-        JdbcSqlStat sqlStat = dataSourceStat.getSqlStatMap().get(sql);
+        final ConcurrentMap<String, JdbcSqlStat> sqlStatMap = dataSourceStat.getSqlStatMap();
+        JdbcSqlStat sqlStat = sqlStatMap.get(sql);
         if (sqlStat == null) {
             JdbcSqlStat newSqlStat = new JdbcSqlStat(sql);
             if (dataSourceStat.getSqlStatMap().putIfAbsent(sql, newSqlStat) == null) {
@@ -659,7 +660,7 @@ public class StatFilter extends FilterEventAdapter implements StatFilterMBean {
     }
 
     public JdbcSqlStat getSqlStat(long id) {
-        return dataSourceStat.getSqlCounter(id);
+        return dataSourceStat.getSqlStat(id);
     }
 
     @Override
diff --git a/src/main/java/com/alibaba/druid/stat/JdbcDataSourceStat.java b/src/main/java/com/alibaba/druid/stat/JdbcDataSourceStat.java
index ed0e5bac9b..d79addb6b3 100644
--- a/src/main/java/com/alibaba/druid/stat/JdbcDataSourceStat.java
+++ b/src/main/java/com/alibaba/druid/stat/JdbcDataSourceStat.java
@@ -84,14 +84,10 @@ public class JdbcDataSourceStat implements JdbcDataSourceStatMBean {
         return url;
     }
 
-    public JdbcSqlStat getSqlCounter(String sql) {
+    public JdbcSqlStat getSqlStat(String sql) {
         return this.sqlStatMap.get(sql);
     }
 
-    public ConcurrentMap<String, JdbcSqlStat> getSqlStatisticMap() {
-        return this.sqlStatMap;
-    }
-
     @Override
     public TabularData getSqlList() throws JMException {
         CompositeType rowType = JdbcSqlStat.getCompositeType();
@@ -107,7 +103,7 @@ public class JdbcDataSourceStat implements JdbcDataSourceStatMBean {
         return data;
     }
 
-    public static StatFilter getCounterFilter(DataSourceProxy dataSource) {
+    public static StatFilter getStatFilter(DataSourceProxy dataSource) {
         for (Filter filter : dataSource.getFilters()) {
             if (filter instanceof StatFilter) {
                 return (StatFilter) filter;
@@ -117,7 +113,7 @@ public class JdbcDataSourceStat implements JdbcDataSourceStatMBean {
         return null;
     }
 
-    public JdbcSqlStat getSqlCounter(long id) {
+    public JdbcSqlStat getSqlStat(long id) {
         for (Map.Entry<String, JdbcSqlStat> entry : this.sqlStatMap.entrySet()) {
             if (entry.getValue().getId() == id) {
                 return entry.getValue();
diff --git a/src/main/java/com/alibaba/druid/stat/JdbcStatManager.java b/src/main/java/com/alibaba/druid/stat/JdbcStatManager.java
index 1d02e5585d..25a0640196 100644
--- a/src/main/java/com/alibaba/druid/stat/JdbcStatManager.java
+++ b/src/main/java/com/alibaba/druid/stat/JdbcStatManager.java
@@ -116,7 +116,7 @@ public class JdbcStatManager implements JdbcStatManagerMBean {
         TabularData data = new TabularDataSupport(tabularType);
 
         for (JdbcDataSourceStat dataSource : dataSources.values()) {
-            ConcurrentMap<String, JdbcSqlStat> statMap = dataSource.getSqlStatisticMap();
+            ConcurrentMap<String, JdbcSqlStat> statMap = dataSource.getSqlStatMap();
             for (Map.Entry<String, JdbcSqlStat> entry : statMap.entrySet()) {
                 data.put(entry.getValue().getCompositeData());
             }