Fix connection leaks in hibernate-testing connection provider delegates

beikov · beikov · commit ebb525ec826f · 2025-07-28T14:31:07.000+02:00
diff --git a/hibernate-core/src/main/java/org/hibernate/engine/jdbc/connections/internal/DriverManagerConnectionProviderImpl.java b/hibernate-core/src/main/java/org/hibernate/engine/jdbc/connections/internal/DriverManagerConnectionProviderImpl.java
@@ -472,7 +472,9 @@ protected void closeConnection(Connection conn, Throwable t) {
 				}
 			}
 			finally {
-				allConnections.remove( conn );
+				if ( !allConnections.remove( conn ) ) {
+					ConnectionInfoLogger.INSTANCE.debug( "Connection remove failed." );
+				}
 			}
 		}
 
diff --git a/hibernate-testing/src/main/java/org/hibernate/testing/jta/JtaAwareConnectionProviderImpl.java b/hibernate-testing/src/main/java/org/hibernate/testing/jta/JtaAwareConnectionProviderImpl.java
@@ -214,7 +214,7 @@ private void delist(Connection connection) {
 			System.err.println( "!!!Error trying to reset synchronization registry!!!" );
 		}
 		try {
-			delegate.closeConnection( connection );
+			delegate.closeConnection( ((ConnectionWrapper) connection).delegate );
 		}
 		catch (SQLException e) {
 			System.err.println( "!!!Error trying to close JDBC connection from delist callbacks!!!" );

Original file line number	Diff line number	Diff line change
`@@ -472,7 +472,9 @@ protected void closeConnection(Connection conn, Throwable t) {`
`472`	`472`	`}`
`473`	`473`	`}`
`474`	`474`	`finally {`
`475`		`- allConnections.remove( conn );`
	`475`	`+ if ( !allConnections.remove( conn ) ) {`
	`476`	`+ ConnectionInfoLogger.INSTANCE.debug( "Connection remove failed." );`
	`477`	`+ }`
`476`	`478`	`}`
`477`	`479`	`}`
`478`	`480`
Original file line number	Diff line number	Diff line change
`@@ -214,7 +214,7 @@ private void delist(Connection connection) {`
`214`	`214`	`System.err.println( "!!!Error trying to reset synchronization registry!!!" );`
`215`	`215`	`}`
`216`	`216`	`try {`
`217`		`- delegate.closeConnection( connection );`
	`217`	`+ delegate.closeConnection( ((ConnectionWrapper) connection).delegate );`
`218`	`218`	`}`
`219`	`219`	`catch (SQLException e) {`
`220`	`220`	`System.err.println( "!!!Error trying to close JDBC connection from delist callbacks!!!" );`