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