removeAbandanded skip running connections

2023-03-04 19:17:16 +00:00 · 2012-08-02 20:12:48 +08:00
parent 8f27a196f1
commit 5e149e6ec0
4 changed files with 167 additions and 109 deletions
@@ -1075,11 +1075,16 @@ public class DruidDataSource extends DruidAbstractDataSource implements DruidDat

        for (; iter.hasNext();) {
            Map.Entry<DruidPooledConnection, ActiveConnectionTraceInfo> entry = iter.next();
+            DruidPooledConnection pooledConnection = entry.getKey();
+            
+            if (pooledConnection.isRunning()) {
+                continue;
+            }
+            
            ActiveConnectionTraceInfo activeInfo = entry.getValue();
            long timeMillis = currentMillis - activeInfo.getConnectTime();

            if (timeMillis >= removeAbandonedTimeoutMillis) {
-                DruidPooledConnection pooledConnection = entry.getKey();
                JdbcUtils.close(pooledConnection);
                removeAbandonedCount++;
                removeCount++;