clear closed Hikari connections

aws · Dec 4, 2024 · 279d373 · 279d373
1 parent f3245e8
commit 279d373
Showing 1 changed file with 14 additions and 1 deletion.
diff --git a/wrapper/src/main/java/software/amazon/jdbc/plugin/OpenedConnectionTracker.java b/wrapper/src/main/java/software/amazon/jdbc/plugin/OpenedConnectionTracker.java
@@ -199,7 +199,20 @@ private void logConnectionQueue(final String host, final Queue<WeakReference<Con
 
   public void pruneNullConnections() {
     openedConnections.forEach((key, queue) -> {
-      queue.removeIf(connectionWeakReference -> Objects.equals(connectionWeakReference.get(), null));
+      queue.removeIf(connectionWeakReference -> {
+        final Connection conn = connectionWeakReference.get();
+        if (conn == null) {
+          return true;
+        }
+        if (conn.getClass().getSimpleName().equals("HikariProxyConnection")) {
+          try {
+            return conn.isClosed();
+          } catch (SQLException ex) {
+            return false;
+          }
+        }
+        return false;
+      });
     });
   }