HHH-14326 Always close the connection even if releasing JDBC resources fails

Signed-off-by: Yoann Rodière <[email protected]>

Author: yrodiere

hibernate-core/src/main/java/org/hibernate/resource/jdbc/internal/LogicalConnectionManagedImpl.java

@@ -215,11 +215,15 @@ private void releaseConnection() {
 					" This might indicate a multi-threaded use of Hibernate in combination with managed resources, which is not supported." );
 		}
 		try {
-			getResourceRegistry().releaseResources();
-			if ( ! localVariableConnection.isClosed() ) {
-				sqlExceptionHelper.logAndClearWarnings( localVariableConnection );
+			try {
+				getResourceRegistry().releaseResources();
+				if ( !localVariableConnection.isClosed() ) {
+					sqlExceptionHelper.logAndClearWarnings( localVariableConnection );
+				}
+			}
+			finally {
+				jdbcConnectionAccess.releaseConnection( localVariableConnection );
 			}
-			jdbcConnectionAccess.releaseConnection( localVariableConnection );
 		}
 		catch (SQLException e) {
 			throw sqlExceptionHelper.convert( e, "Unable to release JDBC Connection" );