git-svn-id: http://code.alibabatech.com/svn/druid/trunk@456 b9813039-fb51-4c41-a8b9-e21c2acb5095
This commit is contained in:
wenshao
2011-07-17 04:52:52 +00:00
parent ec607faceb
commit 2c119c595b
4 changed files with 51 additions and 14 deletions
@@ -39,6 +39,7 @@ import javax.sql.DataSource;
import com.alibaba.druid.filter.Filter;
import com.alibaba.druid.filter.FilterChainImpl;
import com.alibaba.druid.pool.vendor.NullExceptionSorter;
import com.alibaba.druid.proxy.jdbc.ConnectionProxy;
import com.alibaba.druid.proxy.jdbc.DataSourceProxy;
import com.alibaba.druid.util.DruidLoaderUtils;
import com.alibaba.druid.util.JdbcUtils;
@@ -730,8 +731,20 @@ public abstract class DruidAbstractDataSource implements DruidAbstractDataSource
}
}
}
public boolean testConnection(Connection conn) {
if (conn instanceof PoolableConnection) {
conn = ((PoolableConnection) conn).getConnection();
}
if (conn instanceof ConnectionProxy) {
conn = ((ConnectionProxy) conn).getConnectionRaw();
}
return testConnectionInternal(conn);
}
protected boolean testConnection(Connection conn) {
protected boolean testConnectionInternal(Connection conn) {
try {
if (validConnectionChecker != null) {
return validConnectionChecker.isValidConnection(conn);