git-svn-id: http://code.alibabatech.com/svn/druid/trunk@296 b9813039-fb51-4c41-a8b9-e21c2acb5095
This commit is contained in:
wenshao
2011-06-29 05:42:15 +00:00
parent 146b3a9c3a
commit 4f97ded8d4
2 changed files with 5 additions and 5 deletions
@@ -34,7 +34,7 @@ import javax.naming.StringRefAddr;
import com.alibaba.druid.filter.Filter;
import com.alibaba.druid.pool.vendor.MSSQLValidConnectionChecker;
import com.alibaba.druid.pool.vendor.MySqlValidConnectionChecker1;
import com.alibaba.druid.pool.vendor.MySqlValidConnectionChecker;
import com.alibaba.druid.pool.vendor.OracleValidConnectionChecker;
import com.alibaba.druid.proxy.jdbc.DataSourceProxyConfig;
import com.alibaba.druid.util.JdbcUtils;
@@ -131,7 +131,7 @@ public class DruidDataSource extends DruidAbstractDataSource implements DruidDat
this.dbType = JdbcUtils.getDbType(jdbcUrl, driverClass.getClass().getName());
if ("mysql".equals(dbType)) {
this.validConnectionChecker = new MySqlValidConnectionChecker1();
this.validConnectionChecker = new MySqlValidConnectionChecker();
} else if ("oracle".equals(dbType)) {
this.validConnectionChecker = new OracleValidConnectionChecker();
} else if ("sqlserver".equals(dbType)) {
@@ -12,10 +12,10 @@ import com.alibaba.druid.logging.LogFactory;
import com.alibaba.druid.pool.ValidConnectionChecker;
import com.alibaba.druid.util.JdbcUtils;
public class MySqlValidConnectionChecker1 implements ValidConnectionChecker, Serializable {
public class MySqlValidConnectionChecker implements ValidConnectionChecker, Serializable {
private static final long serialVersionUID = 1L;
private static final Log LOG = LogFactory.getLog(MySqlValidConnectionChecker1.class);
private static final Log LOG = LogFactory.getLog(MySqlValidConnectionChecker.class);
private Method ping;
private boolean driverHasPingMethod = false;
@@ -24,7 +24,7 @@ public class MySqlValidConnectionChecker1 implements ValidConnectionChecker, Ser
private static Object[] params = new Object[] {};
@SuppressWarnings({ "unchecked", "rawtypes" })
public MySqlValidConnectionChecker1(){
public MySqlValidConnectionChecker(){
try {
Class mysqlConnection = Thread.currentThread().getContextClassLoader().loadClass("com.mysql.jdbc.Connection");
ping = mysqlConnection.getMethod("ping", new Class[] {});