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

Merge branch 'master' of https://github.com/wenshao/druid

Browse Source
This commit is contained in:
wenshao
2013-04-28 19:30:14 +08:00
parent 1461a14144 be089cad74
commit a530193a90
8 changed files with 23 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/main/java/com/alibaba/druid/pool/DruidAbstractDataSource.java
+2 -2
View File
@@ -82,9 +82,9 @@ public abstract class DruidAbstractDataSource extends WrapperAdapter implements
public final static int DEFAULT_MIN_IDLE = 0;
public final static int DEFAULT_MAX_WAIT = -1;
public final static String DEFAULT_VALIDATION_QUERY = null; //
public final static boolean DEFAULT_TEST_ON_BORROW = true;
public final static boolean DEFAULT_TEST_ON_BORROW = false;
public final static boolean DEFAULT_TEST_ON_RETURN = false;
public final static boolean DEFAULT_WHILE_IDLE = false;
public final static boolean DEFAULT_WHILE_IDLE = true;
public static final long DEFAULT_TIME_BETWEEN_EVICTION_RUNS_MILLIS = -1L;
public static final long DEFAULT_TIME_BETWEEN_CONNECT_ERROR_MILLIS = 30 * 1000;
public static final int DEFAULT_NUM_TESTS_PER_EVICTION_RUN = 3;
src/main/java/com/alibaba/druid/pool/DruidDataSource.java
+4
View File
@@ -575,6 +575,10 @@ public class DruidDataSource extends DruidAbstractDataSource implements DruidDat
if (!(isTestOnBorrow() || isTestOnReturn() || isTestWhileIdle())) {
return;
}
if (this.validConnectionChecker != null) {
return;
}
if (this.getValidationQuery() != null && this.getValidationQuery().length() > 0) {
return;
src/main/java/com/alibaba/druid/pool/vendor/MSSQLValidConnectionChecker.java
Vendored
-4
View File
@@ -45,10 +45,6 @@ public class MSSQLValidConnectionChecker implements ValidConnectionChecker, Seri
return false;
}
if (valiateQuery == null) {
return true;
}
Statement stmt = null;
try {
src/main/java/com/alibaba/druid/pool/vendor/MySqlValidConnectionChecker.java
Vendored
-4
View File
@@ -61,10 +61,6 @@ public class MySqlValidConnectionChecker implements ValidConnectionChecker, Seri
return false;
}
if (valiateQuery == null) {
return true;
}
if (driverHasPingMethod) {
if (conn instanceof DruidPooledConnection) {
conn = ((DruidPooledConnection) conn).getConnection();
src/main/java/com/alibaba/druid/pool/vendor/OracleValidConnectionChecker.java
Vendored
-4
View File
@@ -62,10 +62,6 @@ public class OracleValidConnectionChecker implements ValidConnectionChecker, Ser
return false;
}
if (valiateQuery == null) {
return true;
}
try {
if (conn instanceof DruidPooledConnection) {
conn = ((DruidPooledConnection) conn).getConnection();