diff --git a/src/main/java/com/alibaba/druid/pool/DruidAbstractDataSource.java b/src/main/java/com/alibaba/druid/pool/DruidAbstractDataSource.java index 649fb05f57..135a753f6f 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) { 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; } 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'); },