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
@@ -272,7 +272,7 @@ public class DruidDataSource extends DruidAbstractDataSource implements DruidDat
PoolableConnection poolalbeConnection = getConnectionInternal();
if (isTestOnBorrow()) {
boolean validate = testConnection(poolalbeConnection.getConnection());
boolean validate = testConnectionInternal(poolalbeConnection.getConnection());
if (!validate) {
LOG.debug("skip not validate connection.");
Connection realConnection = poolalbeConnection.getConnection();
@@ -393,7 +393,7 @@ public class DruidDataSource extends DruidAbstractDataSource implements DruidDat
//
if (isTestOnReturn()) {
boolean validate = testConnection(conn);
boolean validate = testConnectionInternal(conn);
if (!validate) {
lock.lock();
try {
@@ -753,7 +753,7 @@ public class DruidDataSource extends DruidAbstractDataSource implements DruidDat
}
for (ConnectionHolder idleConnection : idleConnections) {
if (testConnection(idleConnection.getConnection())) {
if (testConnectionInternal(idleConnection.getConnection())) {
connections[count++] = idleConnection;
idleConnection.setLastActiveMillis(System.currentTimeMillis());
idleCheckCount++;