From 213beaa195c3a6635b9125f5cd5d08c8ea72cbc7 Mon Sep 17 00:00:00 2001 From: Nico Dreessen Date: Fri, 20 Nov 2026 14:17:24 +0100 Subject: [PATCH] Prevent pool exhaustion when borrow listener fails Port the ConnectionPool change from ce37cd8 to the existing borrow listener API. --- .../ebean/datasource/pool/ConnectionPool.java | 21 +++++++++++++------ 1 file changed, 15 insertions(+), 6 deletions(-) diff --git a/ebean-datasource/src/main/java/io/ebean/datasource/pool/ConnectionPool.java b/ebean-datasource/src/main/java/io/ebean/datasource/pool/ConnectionPool.java index 2f7c7d8..eaad777 100644 --- a/ebean-datasource/src/main/java/io/ebean/datasource/pool/ConnectionPool.java +++ b/ebean-datasource/src/main/java/io/ebean/datasource/pool/ConnectionPool.java @@ -695,13 +695,22 @@ private PooledConnection getPooledConnection(boolean heartbeat) throws SQLExcept // not application use so skip poolListener etc return c; } - if (captureStackTrace) { - c.setStackTrace(Thread.currentThread().getStackTrace()); - } - if (poolListener != null) { - poolListener.onAfterBorrowConnection(c); + try { + if (captureStackTrace) { + c.setStackTrace(Thread.currentThread().getStackTrace()); + } + if (poolListener != null) { + poolListener.onAfterBorrowConnection(c); + } + return c; + } catch (Throwable e) { + try { + c.close(); + } catch (Throwable e2) { + e.addSuppressed(e2); + } + throw e; } - return c; } @Override