From 3c091688674f42f94839eab02ac586fd3bc978cf Mon Sep 17 00:00:00 2001 From: Zhanming Qi Date: Fri, 31 Aug 2012 13:09:49 +0800 Subject: [PATCH 1/3] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E6=98=BE=E7=A4=BA?= =?UTF-8?q?=E8=AF=A6=E6=83=85=E6=98=AF=E7=9A=84nav=E9=AB=98=E4=BA=AE?= =?UTF-8?q?=E6=98=BE=E7=A4=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/main/resources/support/http/resources/spring-detail.html | 2 +- .../resources/support/http/resources/websession-detail.html | 2 +- src/main/resources/support/http/resources/weburi-detail.html | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/main/resources/support/http/resources/spring-detail.html b/src/main/resources/support/http/resources/spring-detail.html index d8f9658952..fae3b9230a 100644 --- a/src/main/resources/support/http/resources/spring-detail.html +++ b/src/main/resources/support/http/resources/spring-detail.html @@ -103,7 +103,7 @@ var method = druid.common.getUrlVar("method"); return { init : function() { - druid.common.buildHead(5); + druid.common.buildHead(6); this.ajaxRequestForBasicInfo(); $("#viewJsonApi").attr("href", 'spring-detail.json?class=' + clazz + '&method=' + method); }, diff --git a/src/main/resources/support/http/resources/websession-detail.html b/src/main/resources/support/http/resources/websession-detail.html index 919811fe9d..cd4b24c757 100644 --- a/src/main/resources/support/http/resources/websession-detail.html +++ b/src/main/resources/support/http/resources/websession-detail.html @@ -97,7 +97,7 @@ var sessionId = druid.common.getUrlVar("sessionId"); return { init : function() { - druid.common.buildHead(4); + druid.common.buildHead(5); this.ajaxRequestForBasicInfo(); $("#viewJsonApi").attr("href", 'websession-' + sessionId + '.json'); }, diff --git a/src/main/resources/support/http/resources/weburi-detail.html b/src/main/resources/support/http/resources/weburi-detail.html index 27cbe646d6..9f75f501bc 100644 --- a/src/main/resources/support/http/resources/weburi-detail.html +++ b/src/main/resources/support/http/resources/weburi-detail.html @@ -110,7 +110,7 @@ var uri = druid.common.getUrlVar("uri"); return { init : function() { - druid.common.buildHead(3); + druid.common.buildHead(4); this.ajaxRequestForBasicInfo(); $("#viewJsonApi").attr("href", 'weburi-' + encodeURI(uri) + '.json'); }, From 89e1c97722c8f5ab25b8b750c6d9ce2c77e2c096 Mon Sep 17 00:00:00 2001 From: Zhanming Qi Date: Fri, 31 Aug 2012 13:13:58 +0800 Subject: [PATCH 2/3] =?UTF-8?q?=E5=BC=BA=E5=88=B6=E8=BD=AC=E5=9E=8B?= =?UTF-8?q?=EF=BC=8Cint=E8=BD=AC=E4=B8=BAlong?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/alibaba/druid/pool/DruidAbstractDataSource.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/java/com/alibaba/druid/pool/DruidAbstractDataSource.java b/src/main/java/com/alibaba/druid/pool/DruidAbstractDataSource.java index 2ae8f09340..09cddbb58d 100644 --- a/src/main/java/com/alibaba/druid/pool/DruidAbstractDataSource.java +++ b/src/main/java/com/alibaba/druid/pool/DruidAbstractDataSource.java @@ -564,7 +564,7 @@ public abstract class DruidAbstractDataSource extends WrapperAdapter implements } public void setRemoveAbandonedTimeout(int removeAbandonedTimeout) { - this.removeAbandonedTimeoutMillis = removeAbandonedTimeout * 1000; + this.removeAbandonedTimeoutMillis = (long)removeAbandonedTimeout * 1000; } public void setRemoveAbandonedTimeoutMillis(long removeAbandonedTimeoutMillis) { From eeca2c324dda3af79b03cfd031795aee99c077af Mon Sep 17 00:00:00 2001 From: Zhanming Qi Date: Fri, 31 Aug 2012 13:14:46 +0800 Subject: [PATCH 3/3] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E9=80=BB=E8=BE=91?= =?UTF-8?q?=E9=97=AE=E9=A2=98=E3=80=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/alibaba/druid/stat/DruidStatManagerFacade.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/java/com/alibaba/druid/stat/DruidStatManagerFacade.java b/src/main/java/com/alibaba/druid/stat/DruidStatManagerFacade.java index 7c9cfb9bfe..848c8c4979 100644 --- a/src/main/java/com/alibaba/druid/stat/DruidStatManagerFacade.java +++ b/src/main/java/com/alibaba/druid/stat/DruidStatManagerFacade.java @@ -229,7 +229,7 @@ public final class DruidStatManagerFacade { public List getActiveConnectionStackTraceByDataSourceId(Integer id) { Object datasource = getDruidDataSourceById(id); - if (datasource == null || DruidDataSourceUtils.isRemoveAbandoned(datasource)) { + if (datasource == null || !DruidDataSourceUtils.isRemoveAbandoned(datasource)) { return null; }