From 199364f4f53786634c57f4bb8d1ab1ccbe4424be Mon Sep 17 00:00:00 2001
From: wenshao <szujobs@hotmail.com>
Date: Sun, 12 Aug 2012 14:57:55 +0800
Subject: [PATCH] add webStat support

---
 .../com/alibaba/druid/support/http/stat/WebAppStat.java    | 6 +++---
 src/main/resources/support/http/resources/js/weburi.js     | 5 +++++
 src/main/resources/support/http/resources/weburi.html      | 7 ++++++-
 3 files changed, 14 insertions(+), 4 deletions(-)

diff --git a/src/main/java/com/alibaba/druid/support/http/stat/WebAppStat.java b/src/main/java/com/alibaba/druid/support/http/stat/WebAppStat.java
index d74c3339b3..4c50040a05 100644
--- a/src/main/java/com/alibaba/druid/support/http/stat/WebAppStat.java
+++ b/src/main/java/com/alibaba/druid/support/http/stat/WebAppStat.java
@@ -98,13 +98,13 @@ public class WebAppStat {
 
     public void afterInvoke(long nanoSpan) {
         runningCount.decrementAndGet();
-
-        currentLocal.set(null);
-
+        
         WebURIStat uriStat = WebURIStat.current();
         if (uriStat != null) {
             uriStat.afterInvoke(nanoSpan);
         }
+
+        currentLocal.set(null);
     }
 
     public int getMaxStatUriCount() {
diff --git a/src/main/resources/support/http/resources/js/weburi.js b/src/main/resources/support/http/resources/js/weburi.js
index 511cc5d536..acd16e8ae9 100644
--- a/src/main/resources/support/http/resources/js/weburi.js
+++ b/src/main/resources/support/http/resources/js/weburi.js
@@ -99,5 +99,10 @@ function ajaxResponseForDataSourceSqlStatInfo() {
 		newRow.insertCell(-1).innerHTML = sqlStat.RequestCount;
 		newRow.insertCell(-1).innerHTML = sqlStat.RunningCount;
 		newRow.insertCell(-1).innerHTML = sqlStat.ConcurrentMax;
+		newRow.insertCell(-1).innerHTML = sqlStat.JdbcExecuteCount;
+		newRow.insertCell(-1).innerHTML = sqlStat.JdbcCommitCount;
+		newRow.insertCell(-1).innerHTML = sqlStat.JdbcRollbackCount;
+		newRow.insertCell(-1).innerHTML = sqlStat.JdbcFetchRowCount;
+		newRow.insertCell(-1).innerHTML = sqlStat.JdbcUpdateCount;
 	}
 }
\ No newline at end of file
diff --git a/src/main/resources/support/http/resources/weburi.html b/src/main/resources/support/http/resources/weburi.html
index 1e3959b8c0..c6448a765c 100644
--- a/src/main/resources/support/http/resources/weburi.html
+++ b/src/main/resources/support/http/resources/weburi.html
@@ -25,9 +25,14 @@
 					<tr>
 						<th class="td_lable">N--</th>
 	                    <th class="td_lable"><a id="URI" href="javascript:void(0)" onclick="setOrderBy('URI');">URI</a></th>
-	                    <th class="td_lable" width="50"><a id="RequestCount" href="javascript:void(0)" onclick="setOrderBy('RequestCount');">Running Count</a></th>
+	                    <th class="td_lable" width="50"><a id="RequestCount" href="javascript:void(0)" onclick="setOrderBy('RequestCount');">Request Count</a></th>
 	                    <th class="td_lable" width="50"><a id="th-RunningCount" href="javascript:void(0)" onclick="setOrderBy('RunningCount');">Running Count</a></th>
 	                    <th class="td_lable" width="80"><a id="th-ConcurrentMax" href="javascript:void(0)" onclick="setOrderBy('ConcurrentMax');">Concurrent Max</a></th>
+	                    <th class="td_lable" width="80"><a id="th-JdbcExecuteCount" href="javascript:void(0)" onclick="setOrderBy('JdbcExecuteCount');">JdbcExecuteCount</a></th>
+	                    <th class="td_lable" width="80"><a id="th-JdbcCommitCount" href="javascript:void(0)" onclick="setOrderBy('JdbcCommitCount');">JdbcCommitCount</a></th>
+	                    <th class="td_lable" width="80"><a id="th-JdbcRollbackCount" href="javascript:void(0)" onclick="setOrderBy('JdbcRollbackCount');">JdbcRollbackCount</a></th>
+	                    <th class="td_lable" width="80"><a id="th-JdbcFetchRowCount" href="javascript:void(0)" onclick="setOrderBy('JdbcFetchRowCount');">JdbcFetchRowCount</a></th>
+	                    <th class="td_lable" width="80"><a id="th-JdbcUpdateCount" href="javascript:void(0)" onclick="setOrderBy('JdbcUpdateCount');">JdbcUpdateCount</a></th>
                     </tr>
                 </thead> 
              </table>