Alawn/Druid
1
0
Fork 0
mirror of https://github.com/alibaba/druid.git synced 2023-03-04 19:17:16 +00:00
Code Issues Releases Wiki Activity

Merge pull request #130 from zhanming/master

Browse Source 
fix web page javascript number, and some bug.
This commit is contained in:
温高铁
2012-08-31 04:56:50 -07:00
parent 88908b5f25 eeca2c324d
commit a5324f4086
5 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/main/java/com/alibaba/druid/pool/DruidAbstractDataSource.java
+1 -1
View File
@@ -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) {
src/main/java/com/alibaba/druid/stat/DruidStatManagerFacade.java
+1 -1
View File
@@ -229,7 +229,7 @@ public final class DruidStatManagerFacade {
public List<String> getActiveConnectionStackTraceByDataSourceId(Integer id) {
Object datasource = getDruidDataSourceById(id);
if (datasource == null || DruidDataSourceUtils.isRemoveAbandoned(datasource)) {
if (datasource == null || !DruidDataSourceUtils.isRemoveAbandoned(datasource)) {
return null;
}
src/main/resources/support/http/resources/spring-detail.html
+1 -1
View File
@@ -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);
},
src/main/resources/support/http/resources/websession-detail.html
+1 -1
View File
@@ -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');
},
src/main/resources/support/http/resources/weburi-detail.html
+1 -1
View File
@@ -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');
},