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

add ibatis wrapper & bug fixed for testOnBorrow

Browse Source
This commit is contained in:
wenshao
2012-12-06 13:19:21 +08:00
parent 3b466c2eb9
commit f60181ac45
12 changed files with 220 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/main/java/com/alibaba/druid/pool/DruidAbstractDataSource.java
+9
View File
@@ -56,6 +56,7 @@ import com.alibaba.druid.pool.vendor.NullExceptionSorter;
import com.alibaba.druid.proxy.jdbc.DataSourceProxy;
import com.alibaba.druid.proxy.jdbc.TransactionInfo;
import com.alibaba.druid.stat.JdbcDataSourceStat;
import com.alibaba.druid.stat.JdbcSqlStat;
import com.alibaba.druid.stat.JdbcStatManager;
import com.alibaba.druid.support.logging.Log;
import com.alibaba.druid.support.logging.LogFactory;
@@ -1161,6 +1162,11 @@ 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);
try {
if (validConnectionChecker != null) {
return validConnectionChecker.isValidConnection(conn, validationQuery, validationQueryTimeout);
@@ -1194,6 +1200,9 @@ public abstract class DruidAbstractDataSource extends WrapperAdapter implements
} catch (Exception ex) {
// skip
return false;
} finally {
JdbcSqlStat.setContextSqlFile(sqlFile);
JdbcSqlStat.setContextSqlName(sqlName);
}
}