Cleanup after unexpected exception from external delegation call

Issue: SPR-17559

(cherry picked from commit c024bdcc)

spring-jdbc/src/main/java/org/springframework/jdbc/datasource/DataSourceUtils.java

@@ -111,6 +111,7 @@ public abstract class DataSourceUtils {
 		Connection con = dataSource.getConnection();
 
 		if (TransactionSynchronizationManager.isSynchronizationActive()) {
+			try {
 				// Use same Connection for further JDBC actions within the transaction.
 				// Thread-bound object will get removed by synchronization at transaction completion.
 				ConnectionHolder holderToUse = conHolder;
@@ -128,6 +129,12 @@ public abstract class DataSourceUtils {
 					TransactionSynchronizationManager.bindResource(dataSource, holderToUse);
 				}
 			}
+			catch (RuntimeException ex) {
+				// Unexpected exception from external delegation call -> close Connection and rethrow.
+				releaseConnection(con, dataSource);
+				throw ex;
+			}
+		}
 
 		return con;
 	}

spring-orm/src/main/java/org/springframework/orm/jpa/EntityManagerFactoryUtils.java

@@ -285,6 +285,7 @@ public abstract class EntityManagerFactoryUtils {
 			em = (!CollectionUtils.isEmpty(properties) ? emf.createEntityManager(properties) : emf.createEntityManager());
 		}
 
+		try {
 			// Use same EntityManager for further JPA operations within the transaction.
 			// Thread-bound object will get removed by synchronization at transaction completion.
 			emHolder = new EntityManagerHolder(em);
@@ -300,6 +301,12 @@ public abstract class EntityManagerFactoryUtils {
 						new TransactionScopedEntityManagerSynchronization(emHolder, emf));
 			}
 			TransactionSynchronizationManager.bindResource(emf, emHolder);
+		}
+		catch (RuntimeException ex) {
+			// Unexpected exception from external delegation call -> close EntityManager and rethrow.
+			closeEntityManager(em);
+			throw ex;
+		}
 
 		return em;
 	}