Merge pull request #130 from zhanming/master

fix web page javascript number, and some bug.
This commit is contained in:
温高铁
2012-08-31 04:56:50 -07:00
5 changed files with 5 additions and 5 deletions
@@ -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) {
@@ -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;
}