mirror of
https://github.com/alibaba/druid.git
synced 2023-03-04 19:17:16 +00:00
Merge pull request #130 from zhanming/master
fix web page javascript number, and some bug.
This commit is contained in:
@@ -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;
|
||||
}
|
||||
|
||||
|
||||
Reference in New Issue
Block a user