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

bug fixed for phyTimeoutMillis

Browse Source
This commit is contained in:
高铁
2016-03-12 11:05:24 +08:00
parent 9dc9c808f6
commit c445f3965d
2 changed files with 70 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/main/java/com/alibaba/druid/pool/DruidDataSource.java
+6 -6
View File
@@ -53,8 +53,6 @@ import javax.sql.ConnectionEventListener;
import javax.sql.ConnectionPoolDataSource;
import javax.sql.PooledConnection;
import org.apache.ibatis.jdbc.SQL;
import com.alibaba.druid.Constants;
import com.alibaba.druid.TransactionTimeoutException;
import com.alibaba.druid.VERSION;
@@ -2226,10 +2224,12 @@ public class DruidDataSource extends DruidAbstractDataSource
DruidConnectionHolder connection = connections[i];
if (checkTime) {
long phyConnectTimeMillis = connection.getTimeMillis() - currentTimeMillis;//physical connection connected time
if (phyTimeoutMillis > 0 && phyConnectTimeMillis > phyTimeoutMillis) {
evictList.add(connection);
continue;
if (phyTimeoutMillis > 0) {
long phyConnectTimeMillis = currentTimeMillis - connection.getTimeMillis();
if (phyConnectTimeMillis > phyTimeoutMillis) {
evictList.add(connection);
continue;
}
}
long idleMillis = currentTimeMillis - connection.getLastActiveTimeMillis();