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

bug fixed for tomcat 7 memory leak warnnings

Browse Source
This commit is contained in:
wenshao
2013-04-13 23:37:22 +08:00
parent 31ea197998
commit 65b505acc7
1 changed files with 13 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
+13 -5
View File
@@ -1164,9 +1164,13 @@ public abstract class DruidAbstractDataSource extends WrapperAdapter implements
protected boolean testConnectionInternal(Connection conn) {
String sqlFile = JdbcSqlStat.getContextSqlFile();
String sqlName = JdbcSqlStat.getContextSqlName();
JdbcSqlStat.setContextSqlFile(null);
JdbcSqlStat.setContextSqlName(null);
if (sqlFile != null) {
JdbcSqlStat.setContextSqlFile(null);
}
if (sqlName != null) {
JdbcSqlStat.setContextSqlName(null);
}
try {
if (validConnectionChecker != null) {
return validConnectionChecker.isValidConnection(conn, validationQuery, validationQueryTimeout);
@@ -1201,8 +1205,12 @@ public abstract class DruidAbstractDataSource extends WrapperAdapter implements
// skip
return false;
} finally {
JdbcSqlStat.setContextSqlFile(sqlFile);
JdbcSqlStat.setContextSqlName(sqlName);
if (sqlFile != null) {
JdbcSqlStat.setContextSqlFile(sqlFile);
}
if (sqlName != null) {
JdbcSqlStat.setContextSqlName(sqlName);
}
}
}