diff --git a/src/main/java/com/alibaba/druid/support/http/StatViewServlet.java b/src/main/java/com/alibaba/druid/support/http/StatViewServlet.java
index dae760b44a..cd437ce63a 100644
--- a/src/main/java/com/alibaba/druid/support/http/StatViewServlet.java
+++ b/src/main/java/com/alibaba/druid/support/http/StatViewServlet.java
@@ -10,6 +10,7 @@ import java.util.LinkedHashMap;
 import java.util.List;
 import java.util.Map;
 
+import javax.management.JMException;
 import javax.servlet.ServletException;
 import javax.servlet.http.HttpServlet;
 import javax.servlet.http.HttpServletRequest;
@@ -83,26 +84,26 @@ public class StatViewServlet extends HttpServlet {
         }
 
         if (path.equals("/datasource.json")) {
-            returnJSONResult(request, response, RESULT_CODE_SUCCESS, getJSONDataSourceStatList());
+            returnJSONResult(request, response, RESULT_CODE_SUCCESS, getDataSourceStatList());
             return;
         }
 
         if (path.startsWith("/datasource-")) {
             Integer id = StringUtils.subStringToInteger(path, "datasource-", ".");
-            Object result = getJSONDataSourceStat(id);
+            Object result = getDataSourceStatData(id);
             returnJSONResult(request, response, result == null ? RESULT_CODE_ERROR : RESULT_CODE_SUCCESS, result);
             return;
         }
 
         if (path.equals("/sql.json")) {
-            returnJSONResult(request, response, RESULT_CODE_SUCCESS, getJSONSqlStat());
+            returnJSONResult(request, response, RESULT_CODE_SUCCESS, getSqlStatDataList());
             return;
         }
 
         if (path.startsWith("/sql-")) {
             Integer id = StringUtils.subStringToInteger(path, "sql-", ".");
             if (path.endsWith(".json")) {
-                Object result = getJSONSqlStat(id);
+                Object result = getSqlStatData(id);
                 returnJSONResult(request, response, result == null ? RESULT_CODE_ERROR : RESULT_CODE_SUCCESS, result);
                 return;
             }
@@ -124,13 +125,13 @@ public class StatViewServlet extends HttpServlet {
 
         StringBuilder content = new StringBuilder();
 
-        content.append("<h2>FULL SQL</br></h2> <h4>" + sqlStat.getSql() + "</h4>");
+        content.append("<h2>FULL SQL</h2> <h4>" + sqlStat.getSql() + "</h4>");
         content.append("<h2>Format View:</h2>");
         content.append("<textarea style='width:99%;height:120px;;border:1px #A8C7CE solid;line-height:20px;font-size:12px;'>");
         content.append(SQLUtils.format(sqlStat.getSql(), sqlStat.getDbType()));
-        content.append("</textarea><br>");
+        content.append("</textarea><br />");
         content.append("<p>API:com.alibaba.druid.sql.SQLUtils.format(sql,DBType);</p>");
-        content.append("<br>");
+        content.append("<br />");
 
         List<SQLStatement> statementList = SQLUtils.parseStatements(sqlStat.getSql(), sqlStat.getDbType());
         if (!statementList.isEmpty()) {
@@ -166,16 +167,16 @@ public class StatViewServlet extends HttpServlet {
 
             content.append("</table>");
 
-            content.append("<br>");
+            content.append("<br />");
             content.append("<p>API:</p>");
             content.append("<p>");
-            content.append("List<SQLStatement> statementList = SQLUtils.parseStatements(sqlStat.getSql(), sqlStat.getDbType())</br>");
+            content.append("List<SQLStatement> statementList = SQLUtils.parseStatements(sqlStat.getSql(), sqlStat.getDbType())<br />");
             content.append("SQLStatement statemen = statementList.get(0);</br>");
-            content.append("SchemaStatVisitor visitor = SQLUtils.createSchemaStatVisitor(statementList, sqlStat.getDbType());</br>");
-            content.append("statemen.accept(visitor);</br>");
-            content.append("visitor.getTables() / visitor.getColumns() / visitor.getOrderByColumns() / visitor.getConditions() / visitor.getRelationships()</br>");
+            content.append("SchemaStatVisitor visitor = SQLUtils.createSchemaStatVisitor(statementList, sqlStat.getDbType());<br />");
+            content.append("statemen.accept(visitor);<br />");
+            content.append("visitor.getTables() / visitor.getColumns() / visitor.getOrderByColumns() / visitor.getConditions() / visitor.getRelationships()<br />");
             content.append("</p>");
-            content.append("<br>");
+            content.append("<br />");
         }
 
         response.getWriter().print(mergeTemplatePage("Druid Sql View", content.toString()));
@@ -187,7 +188,7 @@ public class StatViewServlet extends HttpServlet {
         DruidDataSourceStatManager.getInstance().reset();
     }
 
-    private List<String> getJSONDrivers() {
+    private List<String> getDriversData() {
         List<String> drivers = new ArrayList<String>();
         for (Enumeration<Driver> e = DriverManager.getDrivers(); e.hasMoreElements();) {
             Driver driver = e.nextElement();
@@ -197,36 +198,36 @@ public class StatViewServlet extends HttpServlet {
     }
 
     private void returnJSONBasicStat(HttpServletRequest request, HttpServletResponse response) throws IOException {
-        Map<String, Object> json = new LinkedHashMap<String, Object>();
-        json.put("Version", VERSION.getVersionNumber());
-        json.put("Drivers", getJSONDrivers());
+        Map<String, Object> dataMap = new LinkedHashMap<String, Object>();
+        dataMap.put("Version", VERSION.getVersionNumber());
+        dataMap.put("Drivers", getDriversData());
 
-        returnJSONResult(request, response, RESULT_CODE_SUCCESS, json);
+        returnJSONResult(request, response, RESULT_CODE_SUCCESS, dataMap);
 
     }
 
-    private List<Object> getJSONDataSourceStatList() {
+    private List<Object> getDataSourceStatList() {
         List<Object> datasourceList = new ArrayList<Object>();
         for (DruidDataSource dataSource : DruidDataSourceStatManager.getDruidDataSourceInstances()) {
-            datasourceList.add(toJSONDataSource(dataSource));
+            datasourceList.add(dataSourceToMapData(dataSource));
         }
         return datasourceList;
     }
 
-    private Map<String, Object> getJSONDataSourceStat(Integer id) {
+    private Map<String, Object> getDataSourceStatData(Integer id) {
         if (id == null) {
             return null;
         }
         DruidDataSource datasource = getDruidDataSourceById(id);
-        return datasource == null ? null : toJSONDataSource(datasource);
+        return datasource == null ? null : dataSourceToMapData(datasource);
     }
 
-    private Map<String, Object> getJSONSqlStat(Integer id) {
+    private Map<String, Object> getSqlStatData(Integer id) {
         if (id == null) {
             return null;
         }
         JdbcSqlStat sqlStat = getSqlStatById(id);
-        return sqlStat == null ? null : toJSONSqlStat(sqlStat);
+        return sqlStat == null ? null : getSqlStatData(sqlStat);
     }
 
     private JdbcSqlStat getSqlStatById(Integer id) {
@@ -249,102 +250,83 @@ public class StatViewServlet extends HttpServlet {
         return null;
     }
 
-    private List<Object> getJSONSqlStat() {
+    private Map<String, Object> getSqlStatData(JdbcSqlStat sqlStat) {
+        try {
+            return sqlStat.getData();
+        } catch (JMException e) {
+        }
+        return null;
+    }
+
+    private List<Object> getSqlStatDataList() {
         List<Object> array = new ArrayList<Object>();
         for (DruidDataSource datasource : DruidDataSourceStatManager.getDruidDataSourceInstances()) {
             for (JdbcSqlStat sqlStat : datasource.getDataSourceStat().getSqlStatMap().values()) {
-                array.add(toJSONSqlStat(sqlStat));
+                array.add(getSqlStatData(sqlStat));
             }
         }
         return array;
     }
 
-    private Map<String, Object> toJSONSqlStat(JdbcSqlStat sqlStat) {
-        Map<String, Object> json = new LinkedHashMap<String, Object>();
+    private Map<String, Object> dataSourceToMapData(DruidDataSource dataSource) {
 
-        json.put("ID", sqlStat.getId());
-        json.put("SQL", sqlStat.getSql());
-        json.put("File", sqlStat.getFile());
-        json.put("Name", sqlStat.getName());
+        Map<String, Object> dataMap = new LinkedHashMap<String, Object>();
+        dataMap.put("Identity", System.identityHashCode(dataSource));
+        dataMap.put("Name", dataSource.getName());
+        dataMap.put("DbType", dataSource.getDbType());
+        dataMap.put("DriverClassName", dataSource.getDriverClassName());
 
-        json.put("ExecuteCount", sqlStat.getExecuteCount());
-        json.put("ExecuteMillisTotal", sqlStat.getExecuteMillisTotal());
-        json.put("ExecuteMillisMax", sqlStat.getExecuteMillisMax());
+        dataMap.put("URL", dataSource.getUrl());
+        dataMap.put("UserName", dataSource.getUsername());
+        dataMap.put("FilterClassNames", dataSource.getFilterClassNames());
 
-        json.put("InTxnCount", sqlStat.getInTransactionCount());
-        json.put("ErrorCount", sqlStat.getErrorCount());
-        json.put("UpdateCount", sqlStat.getUpdateCount());
-        json.put("FetchRowCount", sqlStat.getFetchRowCount());
-        json.put("RunningCount", sqlStat.getRunningCount());
-        json.put("ConcurrentMax", sqlStat.getConcurrentMax());
+        dataMap.put("WaitThreadCount", dataSource.getWaitThreadCount());
+        dataMap.put("NotEmptyWaitCount", dataSource.getNotEmptyWaitCount());
+        dataMap.put("NotEmptyWaitMillis", dataSource.getNotEmptyWaitMillis());
 
-        json.put("ExecHistogram", sqlStat.getHistogram().toArray());
-        json.put("FetchRowHistogram", sqlStat.getFetchRowCountHistogram().toArray());
-        json.put("UpdateCountHistogram", sqlStat.getUpdateCountHistogram().toArray());
-        json.put("ExecAndRsHoldHistogram", sqlStat.getExecuteAndResultHoldTimeHistogram().toArray());
+        dataMap.put("PoolingCount", dataSource.getPoolingCount());
+        dataMap.put("PoolingPeak", dataSource.getPoolingPeak());
+        dataMap.put("PoolingPeakTime",
+                    dataSource.getPoolingPeakTime() == null ? null : dataSource.getPoolingPeakTime().toString());
 
-        return json;
-    }
+        dataMap.put("ActiveCount", dataSource.getActiveCount());
+        dataMap.put("ActivePeak", dataSource.getActivePeak());
+        dataMap.put("ActivePeakTime",
+                    dataSource.getActivePeakTime() == null ? null : dataSource.getActivePeakTime().toString());
 
-    private Map<String, Object> toJSONDataSource(DruidDataSource dataSource) {
+        dataMap.put("InitialSize", dataSource.getInitialSize());
+        dataMap.put("MinIdle", dataSource.getMinIdle());
+        dataMap.put("MaxActive", dataSource.getMaxActive());
 
-        Map<String, Object> json = new LinkedHashMap<String, Object>();
-        json.put("Identity", System.identityHashCode(dataSource));
-        json.put("Name", dataSource.getName());
-        json.put("DbType", dataSource.getDbType());
-        json.put("DriverClassName", dataSource.getDriverClassName());
+        dataMap.put("TestOnBorrow", dataSource.isTestOnBorrow());
+        dataMap.put("TestWhileIdle", dataSource.isTestWhileIdle());
 
-        json.put("URL", dataSource.getUrl());
-        json.put("UserName", dataSource.getUsername());
-        json.put("FilterClassNames", dataSource.getFilterClassNames());
+        dataMap.put("LogicConnectCount", dataSource.getConnectCount());
+        dataMap.put("LogicCloseCount", dataSource.getCloseCount());
+        dataMap.put("LogicConnectErrorCount", dataSource.getConnectErrorCount());
 
-        json.put("WaitThreadCount", dataSource.getWaitThreadCount());
-        json.put("NotEmptyWaitCount", dataSource.getNotEmptyWaitCount());
-        json.put("NotEmptyWaitMillis", dataSource.getNotEmptyWaitMillis());
+        dataMap.put("PhysicalConnectCount", dataSource.getCreateCount());
+        dataMap.put("PhysicalCloseCount", dataSource.getDestroyCount());
+        dataMap.put("PhysicalConnectErrorCount", dataSource.getCreateErrorCount());
 
-        json.put("PoolingCount", dataSource.getPoolingCount());
-        json.put("PoolingPeak", dataSource.getPoolingPeak());
-        json.put("PoolingPeakTime",
-                 dataSource.getPoolingPeakTime() == null ? null : dataSource.getPoolingPeakTime().toString());
+        dataMap.put("PSCacheAccessCount", dataSource.getCachedPreparedStatementAccessCount());
+        dataMap.put("PSCacheHitCount", dataSource.getCachedPreparedStatementHitCount());
+        dataMap.put("PSCacheMissCount", dataSource.getCachedPreparedStatementMissCount());
 
-        json.put("ActiveCount", dataSource.getActiveCount());
-        json.put("ActivePeak", dataSource.getActivePeak());
-        json.put("ActivePeakTime",
-                 dataSource.getActivePeakTime() == null ? null : dataSource.getActivePeakTime().toString());
-
-        json.put("InitialSize", dataSource.getInitialSize());
-        json.put("MinIdle", dataSource.getMinIdle());
-        json.put("MaxActive", dataSource.getMaxActive());
-
-        json.put("TestOnBorrow", dataSource.isTestOnBorrow());
-        json.put("TestWhileIdle", dataSource.isTestWhileIdle());
-
-        json.put("LogicConnectCount", dataSource.getConnectCount());
-        json.put("LogicCloseCount", dataSource.getCloseCount());
-        json.put("LogicConnectErrorCount", dataSource.getConnectErrorCount());
-
-        json.put("PhysicalConnectCount", dataSource.getCreateCount());
-        json.put("PhysicalCloseCount", dataSource.getDestroyCount());
-        json.put("PhysicalConnectErrorCount", dataSource.getCreateErrorCount());
-
-        json.put("PSCacheAccessCount", dataSource.getCachedPreparedStatementAccessCount());
-        json.put("PSCacheHitCount", dataSource.getCachedPreparedStatementHitCount());
-        json.put("PSCacheMissCount", dataSource.getCachedPreparedStatementMissCount());
-
-        json.put("StartTransactionCount", dataSource.getStartTransactionCount());
-        json.put("TransactionHistogramValues", dataSource.getTransactionHistogramValues());
-        return json;
+        dataMap.put("StartTransactionCount", dataSource.getStartTransactionCount());
+        dataMap.put("TransactionHistogramValues", dataSource.getTransactionHistogramValues());
+        return dataMap;
     }
 
     private void returnJSONResult(HttpServletRequest request, HttpServletResponse response, int resultCode,
                                   Object content) throws IOException {
         PrintWriter out = response.getWriter();
 
-        Map<String, Object> json = new LinkedHashMap<String, Object>();
-        json.put("ResultCode", resultCode);
-        json.put("Content", content);
+        Map<String, Object> dataMap = new LinkedHashMap<String, Object>();
+        dataMap.put("ResultCode", resultCode);
+        dataMap.put("Content", content);
 
-        out.print(JSON.toJSONString(json));
+        out.print(JSON.toJSONString(dataMap));
     }
 
     private void returnResourceFile(String fileName, HttpServletResponse response) throws ServletException, IOException {
diff --git a/src/main/resources/support/http/resources/api.html b/src/main/resources/support/http/resources/api.html
index 18018ac198..315603e33e 100644
--- a/src/main/resources/support/http/resources/api.html
+++ b/src/main/resources/support/http/resources/api.html
@@ -7,11 +7,11 @@
 		<meta http-equiv="Content-Type" content="text/html; charset=utf8" />
     </head>
 	<body onload="init()">
-		</br>
+		<br />
 		<div id="menu" >
 			<a href="index.html">Index</a> | <a href="datasource.html">DataSource</a> | <a href="sql.html">Sql</a> | <a href="#" onclick="ajaxRequestForReset()">Reset All</a> | <a href="api.html">JSON API</a>
 		</div>
-		</br>
+		<br />
 		<div id="main">
             <h2>JSON API</h2>
             <table cellspacing="1" cellpadding="5" id="SqlStatTable" width="99%">
@@ -40,7 +40,7 @@
 						datasource-{id}.json
 					</td>
                     <td>
-						DatasourceStat for id={id},id is DatsSourceStat.ID</br>
+						DatasourceStat for id={id},id is DatsSourceStat.ID<br />
 						Example: druid/datasource-1.json
 					</td>
                 </tr>
@@ -57,7 +57,7 @@
 						sql-{id}.json
 					</td>
                     <td>
-						SqlStat for id={id} ,id is SqlStat.ID</br>
+						SqlStat for id={id} ,id is SqlStat.ID<br />
 						Example: druid/sql-1.json
 					</td>
                 </tr>
diff --git a/src/main/resources/support/http/resources/datasource.html b/src/main/resources/support/http/resources/datasource.html
index 841f472f38..b64f986ddc 100644
--- a/src/main/resources/support/http/resources/datasource.html
+++ b/src/main/resources/support/http/resources/datasource.html
@@ -13,11 +13,11 @@
         </script>
     </head>
 	<body onload="init()">
-		</br>
+		<br />
 		<div id="menu" >
 			<a href="index.html">Index</a> | <a href="datasource.html">DataSource</a> | <a href="sql.html">Sql</a> | <a href="#" onclick="ajaxRequestForReset()">Reset All</a> | <a href="api.html">JSON API</a>
 		</div>
-		</br>
+		<br />
 		<div id="main">
 			<h2>DataSourceStat List<a href="datasource.json" target="_blank">[View JSON API]</a></h2>
             <div id="dataSourceStatList">
diff --git a/src/main/resources/support/http/resources/index.html b/src/main/resources/support/http/resources/index.html
index 9cac813938..ed3fcce48f 100644
--- a/src/main/resources/support/http/resources/index.html
+++ b/src/main/resources/support/http/resources/index.html
@@ -12,11 +12,11 @@
         </script>
     </head>
 	<body onload="init()">
-		</br>
+		<br />
 		<div id="menu" >
 			<a href="index.html">Index</a> | <a href="datasource.html">DataSource</a> | <a href="sql.html">Sql</a> | <a href="#" onclick="ajaxRequestForReset()">Reset All</a> | <a href="api.html">JSON API</a>
 		</div>
-		</br>
+		<br />
 		<div id="main">
             <h2>Stat Index<a href="basic.json" target="_blank">[View JSON API]</a></h2>
             <table cellspacing="1" cellpadding="5">
diff --git a/src/main/resources/support/http/resources/js.js b/src/main/resources/support/http/resources/js.js
index 8925501c4d..b4d5bd732c 100644
--- a/src/main/resources/support/http/resources/js.js
+++ b/src/main/resources/support/http/resources/js.js
@@ -42,40 +42,46 @@ function ajaxRequestForDataSourceInfo() {
 }
 function ajaxResponseForReset() {
 	var html = '';
-	if (xmlHttpForReset.readyState == 4) {
-		if (xmlHttpForReset.status == 200) {
-			var jsonResp = eval("(" + xmlHttpForReset.responseText + ")");
-			if (jsonResp.ResultCode == 1) {
-				alert("already reset all stat");
-			}
-		}
+	if (xmlHttpForReset.readyState != 4) {
+		return;
 	}
+	if (xmlHttpForReset.status != 200) {
+		return;
+	}
+	var jsonResp = eval("(" + xmlHttpForReset.responseText + ")");
+	if (jsonResp.ResultCode == 1) {
+		alert("already reset all stat");
+	}
+
 }
 function ajaxResponseForBasicInfo() {
-	var html = '';
-	if (xmlHttpForBasicInfo.readyState == 4) {
-		if (xmlHttpForBasicInfo.status == 200) {
-			var jsonResp = eval("(" + xmlHttpForBasicInfo.responseText + ")");
-			if (jsonResp.ResultCode == 1) {
-				document.getElementById("DruidVersion").innerHTML = jsonResp.Content.Version;
+	if (xmlHttpForBasicInfo.readyState != 4) {
+		return;
+	}
+	if (xmlHttpForBasicInfo.status != 200) {
+		return;
+	}
+	var jsonResp = eval("(" + xmlHttpForBasicInfo.responseText + ")");
+	if (jsonResp.ResultCode != 1) {
+		return;
+	}
 
-				var driversList = jsonResp.Content.Drivers;
-				if (driversList) {
-					var driverHtml = '';
-					for ( var i = 0; i < driversList.length; i++) {
-						var driver = driversList[i];
-						driverHtml += driver + ' , ';
-					}
-					document.getElementById("DruidDrivers").innerHTML = driverHtml;
-				}
-			}
+	document.getElementById("DruidVersion").innerHTML = jsonResp.Content.Version;
+
+	var driversList = jsonResp.Content.Drivers;
+	if (driversList) {
+		var driverHtml = '';
+		for ( var i = 0; i < driversList.length; i++) {
+			var driver = driversList[i];
+			driverHtml += driver + ' , ';
 		}
+		document.getElementById("DruidDrivers").innerHTML = driverHtml;
 	}
 }
 function changeInnerHtml(id, divHtml) {
 	var divObj = document.getElementById(id);
-	if(divHtml==undefined)
-		divHtml='';
+	if (divHtml == undefined)
+		divHtml = '';
 	if (divObj) {
 		divObj.innerHTML = divHtml;
 	}
@@ -87,21 +93,21 @@ function fillDataSourceInfo(datasource) {
 	changeInnerHtml("DS-Info-DbType" + datasource.Identity, datasource.DbType);
 	changeInnerHtml("DS-Info-DriverClassName" + datasource.Identity, datasource.DriverClassName);
 	changeInnerHtml("DS-Info-FilterClassNames" + datasource.Identity, datasource.FilterClassNames);
-	
+
 	changeInnerHtml("DS-Info-TestOnBorrow" + datasource.Identity, datasource.TestOnBorrow);
 	changeInnerHtml("DS-Info-TestWhileIdle" + datasource.Identity, datasource.TestWhileIdle);
-	
+
 	changeInnerHtml("DS-Info-InitialSize" + datasource.Identity, datasource.InitialSize);
 	changeInnerHtml("DS-Info-MinIdle" + datasource.Identity, datasource.MinIdle);
 	changeInnerHtml("DS-Info-MaxActive" + datasource.Identity, datasource.MaxActive);
-	
+
 	changeInnerHtml("DS-Info-NotEmptyWaitCount" + datasource.Identity, datasource.NotEmptyWaitCount);
 	changeInnerHtml("DS-Info-NotEmptyWaitMillis" + datasource.Identity, datasource.NotEmptyWaitMillis);
 	changeInnerHtml("DS-Info-WaitThreadCount" + datasource.Identity, datasource.WaitThreadCount);
-	
+
 	changeInnerHtml("DS-Info-StartTransactionCount" + datasource.Identity, datasource.StartTransactionCount);
 	changeInnerHtml("DS-Info-TransactionHistogramValues" + datasource.Identity, datasource.TransactionHistogramValues);
-	
+
 	changeInnerHtml("DS-Info-PoolingCount" + datasource.Identity, datasource.PoolingCount);
 	changeInnerHtml("DS-Info-PoolingPeak" + datasource.Identity, datasource.PoolingPeak);
 	changeInnerHtml("DS-Info-PoolingPeakTime" + datasource.Identity, datasource.PoolingPeakTime);
@@ -109,82 +115,90 @@ function fillDataSourceInfo(datasource) {
 	changeInnerHtml("DS-Info-ActiveCount" + datasource.Identity, datasource.ActiveCount);
 	changeInnerHtml("DS-Info-ActivePeak" + datasource.Identity, datasource.ActivePeak);
 	changeInnerHtml("DS-Info-ActivePeakTime" + datasource.Identity, datasource.ActivePeakTime);
-	
+
 	changeInnerHtml("DS-Info-LogicConnectCount" + datasource.Identity, datasource.LogicConnectCount);
 	changeInnerHtml("DS-Info-LogicCloseCount" + datasource.Identity, datasource.LogicCloseCount);
 	changeInnerHtml("DS-Info-LogicConnectErrorCount" + datasource.Identity, datasource.LogicConnectErrorCount);
-	
+
 	changeInnerHtml("DS-Info-PhysicalConnectCount" + datasource.Identity, datasource.PhysicalConnectCount);
 	changeInnerHtml("DS-Info-PhysicalCloseCount" + datasource.Identity, datasource.PhysicalCloseCount);
 	changeInnerHtml("DS-Info-PhysicalConnectErrorCount" + datasource.Identity, datasource.PhysicalConnectErrorCount);
-	
+
 	changeInnerHtml("DS-Info-PSCacheAccessCount" + datasource.Identity, datasource.PSCacheAccessCount);
 	changeInnerHtml("DS-Info-PSCacheHitCount" + datasource.Identity, datasource.PSCacheHitCount);
 	changeInnerHtml("DS-Info-PSCacheMissCount" + datasource.Identity, datasource.PSCacheMissCount);
 }
+function generateDataSourceDiv(datasource) {
+	var listHtml = '';
+	var datasourceId = datasource.Identity;
+	listHtml += '<div id="dataSourceStat' + datasourceId + '">';
+	listHtml += '<h2>Basic Info For <span id="DS-Info-Title' + datasourceId + '"></span><a href="datasource-' + datasourceId + '.json" target="_blank">[View JSON API]</a></h2>';
+	listHtml += '<table cellpadding="5" cellspacing="1" width="99%">';
+
+	listHtml += '<tr><td class="td_lable" width="230">UserName</td><td id="DS-Info-UserName' + datasourceId + '">&nbsp;</td><td>用户名称</td></tr>';
+	listHtml += '<tr><td class="td_lable">URL</td><td id="DS-Info-URL' + datasourceId + '">&nbsp;</td><td>数据源的JdbcURL</td></tr>';
+	listHtml += '<tr><td class="td_lable">DbType</td><td id="DS-Info-DbType' + datasourceId + '">&nbsp;</td><td>数据库类型</td></tr>';
+	listHtml += '<tr><td class="td_lable">DriverClassName</td><td id="DS-Info-DriverClassName' + datasourceId + '">&nbsp;</td><td>Jdbc驱动的名称</td></tr>';
+	listHtml += '<tr><td class="td_lable">FilterClassNames</td><td id="DS-Info-FilterClassNames' + datasourceId + '">&nbsp;</td><td>启用的filter的名称</td></tr>';
+
+	listHtml += '<tr><td class="td_lable">TestOnBorrow</td><td id="DS-Info-TestOnBorrow' + datasourceId + '">&nbsp;</td><td>借出连接时是否做测试</td></tr>';
+	listHtml += '<tr><td class="td_lable">TestWhileIdle</td><td id="DS-Info-TestWhileIdle' + datasourceId + '">&nbsp;</td><td>归还连接时是否做测试</td></tr>';
+
+	listHtml += '<tr><td class="td_lable">InitialSize</td><td id="DS-Info-InitialSize' + datasourceId + '">&nbsp;</td><td>初始连接池大小</td></tr>';
+	listHtml += '<tr><td class="td_lable">MinIdle</td><td id="DS-Info-MinIdle' + datasourceId + '">&nbsp;</td><td>连接池最小连接数</td></tr>';
+	listHtml += '<tr><td class="td_lable">MaxActive</td><td id="DS-Info-MaxActive' + datasourceId + '">&nbsp;</td><td>连接池最大连接数</td></tr>';
+
+	listHtml += '<tr><td class="td_lable">NotEmptyWaitCount</td><td id="DS-Info-NotEmptyWaitCount' + datasourceId + '">&nbsp;</td><td>等待获取连接的次数</td></tr>';
+	listHtml += '<tr><td class="td_lable">NotEmptyWaitMillis</td><td id="DS-Info-NotEmptyWaitMillis' + datasourceId + '">&nbsp;</td><td>获取连接等待的时间总</td></tr>';
+	listHtml += '<tr><td class="td_lable">WaitThreadCount</td><td id="DS-Info-WaitThreadCount' + datasourceId + '">&nbsp;</td><td>当前正在等待获取连接的线程数量</td></tr>';
+
+	listHtml += '<tr><td class="td_lable">StartTransactionCount</td><td id="DS-Info-StartTransactionCount' + datasourceId + '">&nbsp;</td><td>启动事务次数</td></tr>';
+	listHtml += '<tr><td class="td_lable">TransactionHistogramValues</td><td id="DS-Info-TransactionHistogramValues' + datasourceId + '">&nbsp;</td><td>事务的持续时间直方图</td></tr>';
+
+	listHtml += '<tr><td class="td_lable">PoolingCount</td><td id="DS-Info-PoolingCount' + datasourceId + '">&nbsp;</td><td>连接池可用连接数</td></tr>';
+	listHtml += '<tr><td class="td_lable">PoolingPeak</td><td id="DS-Info-PoolingPeak' + datasourceId + '">&nbsp;</td><td>连接池可用连接数峰值</td></tr>';
+	listHtml += '<tr><td class="td_lable">PoolingPeakTime</td><td id="DS-Info-PoolingPeakTime' + datasourceId + '">&nbsp;</td><td>连接池可用连接数峰值时间</td></tr>';
+
+	listHtml += '<tr><td class="td_lable">ActiveCount</td><td id="DS-Info-ActiveCount' + datasourceId + '">&nbsp;</td><td>当前活动连接数</td></tr>';
+	listHtml += '<tr><td class="td_lable">ActivePeak</td><td id="DS-Info-ActivePeak' + datasourceId + '">&nbsp;</td><td>连接数峰值</td></tr>';
+	listHtml += '<tr><td class="td_lable">ActivePeakTime</td><td id="DS-Info-ActivePeakTime' + datasourceId + '">&nbsp;</td><td>连接数峰值时间</td></tr>';
+
+	listHtml += '<tr><td class="td_lable">LogicConnectCount</td><td id="DS-Info-LogicConnectCount' + datasourceId + '">&nbsp;</td><td>申请连接的次数</td></tr>';
+	listHtml += '<tr><td class="td_lable">LogicCloseCount</td><td id="DS-Info-LogicCloseCount' + datasourceId + '">&nbsp;</td><td>关闭连接的次数</td></tr>';
+	listHtml += '<tr><td class="td_lable">LogicConnectErrorCount</td><td id="DS-Info-LogicConnectErrorCount' + datasourceId + '">&nbsp;</td><td>连接错误数</td></tr>';
+
+	listHtml += '<tr><td class="td_lable">PhysicalConnectCount</td><td id="DS-Info-PhysicalConnectCount' + datasourceId + '">&nbsp;</td><td>创建物理连接次数</td></tr>';
+	listHtml += '<tr><td class="td_lable">PhysicalCloseCount</td><td id="DS-Info-PhysicalCloseCount' + datasourceId + '">&nbsp;</td><td>物理连接关闭次数</td></tr>';
+	listHtml += '<tr><td class="td_lable">PhysicalConnectErrorCount</td><td id="DS-Info-PhysicalConnectErrorCount' + datasourceId + '">&nbsp;</td><td>建立物理连接错误数</td></tr>';
+
+	listHtml += '<tr><td class="td_lable">PSCacheAccessCount</td><td id="DS-Info-PSCacheAccessCount' + datasourceId + '">&nbsp;</td><td>PerpareStatement缓存次数</td></tr>';
+	listHtml += '<tr><td class="td_lable">PSCacheHitCount</td><td id="DS-Info-PSCacheHitCount' + datasourceId + '">&nbsp;</td><td>PerpareStatement缓存命中次数</td></tr>';
+	listHtml += '<tr><td class="td_lable">PSCacheMissCount</td><td id="DS-Info-PSCacheMissCount' + datasourceId + '">&nbsp;</td><td>PerpareStatement缓存未命中次数</td></tr>';
+	listHtml += '</table>';
+	listHtml += '</div>';
+
+	document.getElementById("dataSourceStatList").innerHTML += listHtml;
+}
 function ajaxResponseForDataSourceInfo() {
-	if (xmlHttpForDataSourceInfo.readyState == 4) {
-		if (xmlHttpForDataSourceInfo.status == 200) {
-			var jsonResp = eval("(" + xmlHttpForDataSourceInfo.responseText + ")");
-			if (jsonResp.ResultCode == 1) {
-				var datasourceList = jsonResp.Content;
-				for ( var i = 0; i < datasourceList.length; i++) {
-					var datasource = datasourceList[i];
-					if (!document.getElementById("dataSourceStat" + datasource.Identity)) {
-						var listHtml = '';
-						var datasourceId = datasource.Identity;
-						listHtml += '<div id="dataSourceStat' + datasourceId + '">';
-						listHtml += '<h2>Basic Info For <span id="DS-Info-Title' + datasourceId + '"></span><a href="datasource-' + datasourceId + '.json" target="_blank">[View JSON API]</a></h2>';
-						listHtml += '<table cellpadding="5" cellspacing="1" width="99%">';
-						
-						listHtml += '<tr><td class="td_lable" width="230">UserName</td><td id="DS-Info-UserName' + datasourceId + '">&nbsp;</td><td>用户名称</td></tr>';
-						listHtml += '<tr><td class="td_lable">URL</td><td id="DS-Info-URL' + datasourceId + '">&nbsp;</td><td>数据源的JdbcURL</td></tr>';
-						listHtml += '<tr><td class="td_lable">DbType</td><td id="DS-Info-DbType' + datasourceId + '">&nbsp;</td><td>数据库类型</td></tr>';
-						listHtml += '<tr><td class="td_lable">DriverClassName</td><td id="DS-Info-DriverClassName' + datasourceId + '">&nbsp;</td><td>Jdbc驱动的名称</td></tr>';
-						listHtml += '<tr><td class="td_lable">FilterClassNames</td><td id="DS-Info-FilterClassNames' + datasourceId + '">&nbsp;</td><td>启用的filter的名称</td></tr>';
-						
-						listHtml += '<tr><td class="td_lable">TestOnBorrow</td><td id="DS-Info-TestOnBorrow' + datasourceId + '">&nbsp;</td><td>借出连接时是否做测试</td></tr>';
-						listHtml += '<tr><td class="td_lable">TestWhileIdle</td><td id="DS-Info-TestWhileIdle' + datasourceId + '">&nbsp;</td><td>归还连接时是否做测试</td></tr>';
-						
-						listHtml += '<tr><td class="td_lable">InitialSize</td><td id="DS-Info-InitialSize' + datasourceId + '">&nbsp;</td><td>初始连接池大小</td></tr>';
-						listHtml += '<tr><td class="td_lable">MinIdle</td><td id="DS-Info-MinIdle' + datasourceId + '">&nbsp;</td><td>连接池最小连接数</td></tr>';
-						listHtml += '<tr><td class="td_lable">MaxActive</td><td id="DS-Info-MaxActive' + datasourceId + '">&nbsp;</td><td>连接池最大连接数</td></tr>';
-						
-						listHtml += '<tr><td class="td_lable">NotEmptyWaitCount</td><td id="DS-Info-NotEmptyWaitCount' + datasourceId + '">&nbsp;</td><td>等待获取连接的次数</td></tr>';
-						listHtml += '<tr><td class="td_lable">NotEmptyWaitMillis</td><td id="DS-Info-NotEmptyWaitMillis' + datasourceId + '">&nbsp;</td><td>获取连接等待的时间总</td></tr>';
-						listHtml += '<tr><td class="td_lable">WaitThreadCount</td><td id="DS-Info-WaitThreadCount' + datasourceId + '">&nbsp;</td><td>当前正在等待获取连接的线程数量</td></tr>';
-						
-						listHtml += '<tr><td class="td_lable">StartTransactionCount</td><td id="DS-Info-StartTransactionCount' + datasourceId + '">&nbsp;</td><td>启动事务次数</td></tr>';
-						listHtml += '<tr><td class="td_lable">TransactionHistogramValues</td><td id="DS-Info-TransactionHistogramValues' + datasourceId + '">&nbsp;</td><td>事务的持续时间直方图</td></tr>';
-						
-						listHtml += '<tr><td class="td_lable">PoolingCount</td><td id="DS-Info-PoolingCount' + datasourceId + '">&nbsp;</td><td>连接池可用连接数</td></tr>';
-						listHtml += '<tr><td class="td_lable">PoolingPeak</td><td id="DS-Info-PoolingPeak' + datasourceId + '">&nbsp;</td><td>连接池可用连接数峰值</td></tr>';
-						listHtml += '<tr><td class="td_lable">PoolingPeakTime</td><td id="DS-Info-PoolingPeakTime' + datasourceId + '">&nbsp;</td><td>连接池可用连接数峰值时间</td></tr>';
-
-						listHtml += '<tr><td class="td_lable">ActiveCount</td><td id="DS-Info-ActiveCount' + datasourceId + '">&nbsp;</td><td>当前活动连接数</td></tr>';
-						listHtml += '<tr><td class="td_lable">ActivePeak</td><td id="DS-Info-ActivePeak' + datasourceId + '">&nbsp;</td><td>连接数峰值</td></tr>';
-						listHtml += '<tr><td class="td_lable">ActivePeakTime</td><td id="DS-Info-ActivePeakTime' + datasourceId + '">&nbsp;</td><td>连接数峰值时间</td></tr>';
-						
-						listHtml += '<tr><td class="td_lable">LogicConnectCount</td><td id="DS-Info-LogicConnectCount' + datasourceId + '">&nbsp;</td><td>申请连接的次数</td></tr>';
-						listHtml += '<tr><td class="td_lable">LogicCloseCount</td><td id="DS-Info-LogicCloseCount' + datasourceId + '">&nbsp;</td><td>关闭连接的次数</td></tr>';
-						listHtml += '<tr><td class="td_lable">LogicConnectErrorCount</td><td id="DS-Info-LogicConnectErrorCount' + datasourceId + '">&nbsp;</td><td>连接错误数</td></tr>';
-						
-						listHtml += '<tr><td class="td_lable">PhysicalConnectCount</td><td id="DS-Info-PhysicalConnectCount' + datasourceId + '">&nbsp;</td><td>创建物理连接次数</td></tr>';
-						listHtml += '<tr><td class="td_lable">PhysicalCloseCount</td><td id="DS-Info-PhysicalCloseCount' + datasourceId + '">&nbsp;</td><td>物理连接关闭次数</td></tr>';
-						listHtml += '<tr><td class="td_lable">PhysicalConnectErrorCount</td><td id="DS-Info-PhysicalConnectErrorCount' + datasourceId + '">&nbsp;</td><td>建立物理连接错误数</td></tr>';
-						
-						listHtml += '<tr><td class="td_lable">PSCacheAccessCount</td><td id="DS-Info-PSCacheAccessCount' + datasourceId + '">&nbsp;</td><td>PerpareStatement缓存次数</td></tr>';
-						listHtml += '<tr><td class="td_lable">PSCacheHitCount</td><td id="DS-Info-PSCacheHitCount' + datasourceId + '">&nbsp;</td><td>PerpareStatement缓存命中次数</td></tr>';
-						listHtml += '<tr><td class="td_lable">PSCacheMissCount</td><td id="DS-Info-PSCacheMissCount' + datasourceId + '">&nbsp;</td><td>PerpareStatement缓存未命中次数</td></tr>';
-						listHtml += '</table>';
-						listHtml += '</div>';
-
-						document.getElementById("dataSourceStatList").innerHTML += listHtml;
-					}
-					fillDataSourceInfo(datasource);
-				}
-			}
+	if (xmlHttpForDataSourceInfo.readyState != 4) {
+		return;
+	}
+	if (xmlHttpForDataSourceInfo.status != 200) {
+		return;
+	}
+	var jsonResp = eval("(" + xmlHttpForDataSourceInfo.responseText + ")");
+	if (jsonResp.ResultCode != 1) {
+		return;
+	}
+	var datasourceList = jsonResp.Content;
+	for ( var i = 0; i < datasourceList.length; i++) {
+		var datasource = datasourceList[i];
+		if (document.getElementById("dataSourceStat" + datasource.Identity)) {
+			fillDataSourceInfo(datasource);
+			continue;
 		}
+		generateDataSourceDiv(datasource);
+		fillDataSourceInfo(datasource);
 	}
 }
 function subSqlString(sql, len) {
@@ -193,45 +207,48 @@ function subSqlString(sql, len) {
 	return sql.substr(0, len) + '...';
 }
 function ajaxResponseForDataSourceSqlStatInfo() {
-	if (xmlHttpForDataSourceSqlStatInfo.readyState == 4) {
-		if (xmlHttpForDataSourceSqlStatInfo.status == 200) {
-			var jsonResp = eval("(" + xmlHttpForDataSourceSqlStatInfo.responseText + ")");
-			if (jsonResp.ResultCode == 1) {
-				var sqlStatList = jsonResp.Content;
-				var sqlStatTable = document.getElementById("SqlStatTable");
-				while (sqlStatTable.rows.length > 1) {
-					sqlStatTable.deleteRow(1);
-				}
-				for ( var i = 0; i < sqlStatList.length; i++) {
-					var sqlStat = sqlStatList[i];
-					var newRow = sqlStatTable.insertRow(-1);
-					newRow.insertCell(-1).innerHTML = '<a target="_blank" href="sql-' + sqlStat.ID + '.html">' + subSqlString(sqlStat.SQL, 25) + '</a>';
-					if (sqlStat.File)
-						newRow.insertCell(-1).innerHTML = sqlStat.File;
-					else
-						newRow.insertCell(-1).innerHTML = '';
-					if (sqlStat.Name)
-						newRow.insertCell(-1).innerHTML = sqlStat.Name;
-					else
-						newRow.insertCell(-1).innerHTML = '';
-					newRow.insertCell(-1).innerHTML = sqlStat.ExecuteCount;
-					newRow.insertCell(-1).innerHTML = sqlStat.ExecuteMillisTotal;
-					newRow.insertCell(-1).innerHTML = sqlStat.ExecuteMillisMax;
-					newRow.insertCell(-1).innerHTML = sqlStat.InTxnCount;
-					newRow.insertCell(-1).innerHTML = sqlStat.ErrorCount;
-					newRow.insertCell(-1).innerHTML = sqlStat.UpdateCount;
-					newRow.insertCell(-1).innerHTML = sqlStat.FetchRowCount;
-					newRow.insertCell(-1).innerHTML = sqlStat.RunningCount;
-					newRow.insertCell(-1).innerHTML = sqlStat.ConcurrentMax;
-					var hi = newRow.insertCell(-1);
-					var hiHtml = '';
-					hiHtml += '<a href="#' + sqlStat.ExecHistogram + '">ExecHistogram</a> |';
-					hiHtml += '<a href="#' + sqlStat.FetchRowHistogram + '">FetchRow</a> | ';
-					hiHtml += '<a href="#' + sqlStat.UpdateCountHistogram + '">UpdateCount</a> | ';
-					hiHtml += '<a href="#' + sqlStat.ExecAndRsHoldHistogram + '">ExecAndRsHold</a>';
-					hi.innerHTML = hiHtml;
-				}
-			}
-		}
+	if (xmlHttpForDataSourceSqlStatInfo.readyState != 4) {
+		return;
+	}
+	if (xmlHttpForDataSourceSqlStatInfo.status != 200) {
+		return;
+	}
+	var jsonResp = eval("(" + xmlHttpForDataSourceSqlStatInfo.responseText + ")");
+	if (jsonResp.ResultCode != 1) {
+		return;
+	}
+	var sqlStatList = jsonResp.Content;
+	var sqlStatTable = document.getElementById("SqlStatTable");
+	while (sqlStatTable.rows.length > 1) {
+		sqlStatTable.deleteRow(1);
+	}
+	for ( var i = 0; i < sqlStatList.length; i++) {
+		var sqlStat = sqlStatList[i];
+		var newRow = sqlStatTable.insertRow(-1);
+		newRow.insertCell(-1).innerHTML = '<a target="_blank" href="sql-' + sqlStat.ID + '.html">' + subSqlString(sqlStat.SQL, 25) + '</a>';
+		if (sqlStat.File)
+			newRow.insertCell(-1).innerHTML = sqlStat.File;
+		else
+			newRow.insertCell(-1).innerHTML = '';
+		if (sqlStat.Name)
+			newRow.insertCell(-1).innerHTML = sqlStat.Name;
+		else
+			newRow.insertCell(-1).innerHTML = '';
+		newRow.insertCell(-1).innerHTML = sqlStat.ExecuteCount;
+		newRow.insertCell(-1).innerHTML = sqlStat.TotalTime;
+		newRow.insertCell(-1).innerHTML = sqlStat.MaxTimespan;
+		newRow.insertCell(-1).innerHTML = sqlStat.InTransactionCount;
+		newRow.insertCell(-1).innerHTML = sqlStat.ErrorCount;
+		newRow.insertCell(-1).innerHTML = sqlStat.EffectedRowCount;
+		newRow.insertCell(-1).innerHTML = sqlStat.FetchRowCount;
+		newRow.insertCell(-1).innerHTML = sqlStat.RunningCount;
+		newRow.insertCell(-1).innerHTML = sqlStat.ConcurrentMax;
+		var hi = newRow.insertCell(-1);
+		var hiHtml = '';
+		hiHtml += '<a href="#' + sqlStat.Histogram + '">ExecHistogram</a> |';
+		hiHtml += '<a href="#' + sqlStat.FetchRowCountHistogram + '">FetchRow</a> | ';
+		hiHtml += '<a href="#' + sqlStat.EffectedRowCountHistogram + '">UpdateCount</a> | ';
+		hiHtml += '<a href="#' + sqlStat.ExecuteAndResultHoldTimeHistogram + '">ExecAndRsHold</a>';
+		hi.innerHTML = hiHtml;
 	}
 }
\ No newline at end of file
diff --git a/src/main/resources/support/http/resources/sql.html b/src/main/resources/support/http/resources/sql.html
index 205533a36d..3b44433133 100644
--- a/src/main/resources/support/http/resources/sql.html
+++ b/src/main/resources/support/http/resources/sql.html
@@ -13,11 +13,11 @@
         </script>
     </head>
 	<body onload="init()">
-		</br>
+		<br />
 		<div id="menu" >
 			<a href="index.html">Index</a> | <a href="datasource.html">DataSource</a> | <a href="sql.html">Sql</a> | <a href="#" onclick="ajaxRequestForReset()">Reset All</a> | <a href="api.html">JSON API</a>
 		</div>
-		</br>
+		<br />
 		<div id="main">
             <h2>SqlStat List<a href="sql.json" target="_blank">[View JSON API]</a></h2>
             <table cellspacing="1" cellpadding="5" id="SqlStatTable" width="99%">
diff --git a/src/main/resources/support/http/resources/template.html b/src/main/resources/support/http/resources/template.html
index 24d40c4264..36d5b4ce3b 100644
--- a/src/main/resources/support/http/resources/template.html
+++ b/src/main/resources/support/http/resources/template.html
@@ -7,11 +7,11 @@
 		<script src="js.js" type="text/javascript"></script>
     </head>
 	<body>
-		</br>
+		<br />
 		<div id="menu" >
 			<a href="index.html">Index</a> | <a href="datasource.html">DataSource</a> | <a href="sql.html">Sql</a> | <a href="#" onclick="ajaxRequestForReset()">Reset All</a> | <a href="api.html">JSON API</a>
 		</div>
-		</br>
+		<br />
 		<div id="main">
             {content}
         </div>