From 4f97ded8d47da830c9d2c11e232369a45eb0c6c5 Mon Sep 17 00:00:00 2001 From: wenshao Date: Wed, 29 Jun 2011 05:42:15 +0000 Subject: [PATCH] =?UTF-8?q?=E9=87=8D=E6=9E=84?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit git-svn-id: http://code.alibabatech.com/svn/druid/trunk@296 b9813039-fb51-4c41-a8b9-e21c2acb5095 --- src/main/java/com/alibaba/druid/pool/DruidDataSource.java | 4 ++-- ...ectionChecker1.java => MySqlValidConnectionChecker.java} | 6 +++--- 2 files changed, 5 insertions(+), 5 deletions(-) rename src/main/java/com/alibaba/druid/pool/vendor/{MySqlValidConnectionChecker1.java => MySqlValidConnectionChecker.java} (92%) diff --git a/src/main/java/com/alibaba/druid/pool/DruidDataSource.java b/src/main/java/com/alibaba/druid/pool/DruidDataSource.java index aeab51603e..034da9b70d 100644 --- a/src/main/java/com/alibaba/druid/pool/DruidDataSource.java +++ b/src/main/java/com/alibaba/druid/pool/DruidDataSource.java @@ -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)) { diff --git a/src/main/java/com/alibaba/druid/pool/vendor/MySqlValidConnectionChecker1.java b/src/main/java/com/alibaba/druid/pool/vendor/MySqlValidConnectionChecker.java similarity index 92% rename from src/main/java/com/alibaba/druid/pool/vendor/MySqlValidConnectionChecker1.java rename to src/main/java/com/alibaba/druid/pool/vendor/MySqlValidConnectionChecker.java index 27efd9faa7..77850c80bd 100644 --- a/src/main/java/com/alibaba/druid/pool/vendor/MySqlValidConnectionChecker1.java +++ b/src/main/java/com/alibaba/druid/pool/vendor/MySqlValidConnectionChecker.java @@ -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[] {});