Avoid log statements between resource opening and returning

Issue: SPR-17559

(cherry picked from commit 7854b7a)

Author: jhoeller

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

@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2017 the original author or authors.
+ * Copyright 2002-2018 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -111,7 +111,6 @@ public static Connection doGetConnection(DataSource dataSource) throws SQLExcept
 		Connection con = dataSource.getConnection();
 
 		if (TransactionSynchronizationManager.isSynchronizationActive()) {
-			logger.debug("Registering transaction synchronization for JDBC Connection");
 			// Use same Connection for further JDBC actions within the transaction.
 			// Thread-bound object will get removed by synchronization at transaction completion.
 			ConnectionHolder holderToUse = conHolder;
@@ -326,7 +325,6 @@ public static void doReleaseConnection(Connection con, DataSource dataSource) th
 				return;
 			}
 		}
-		logger.debug("Returning JDBC Connection to DataSource");
 		doCloseConnection(con, dataSource);
 	}
 

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

@@ -148,7 +148,7 @@ public static EntityManagerFactory findEntityManagerFactory(
 	 * Obtain a JPA EntityManager from the given factory. Is aware of a corresponding
 	 * EntityManager bound to the current thread, e.g. when using JpaTransactionManager.
 	 * <p>Note: Will return {@code null} if no thread-bound EntityManager found!
-	 * @param emf EntityManagerFactory to create the EntityManager with
+	 * @param emf the EntityManagerFactory to create the EntityManager with
 	 * @return the EntityManager, or {@code null} if none found
 	 * @throws DataAccessResourceFailureException if the EntityManager couldn't be obtained
 	 * @see JpaTransactionManager
@@ -163,7 +163,7 @@ public static EntityManager getTransactionalEntityManager(EntityManagerFactory e
 	 * Obtain a JPA EntityManager from the given factory. Is aware of a corresponding
 	 * EntityManager bound to the current thread, e.g. when using JpaTransactionManager.
 	 * <p>Note: Will return {@code null} if no thread-bound EntityManager found!
-	 * @param emf EntityManagerFactory to create the EntityManager with
+	 * @param emf the EntityManagerFactory to create the EntityManager with
 	 * @param properties the properties to be passed into the {@code createEntityManager}
 	 * call (may be {@code null})
 	 * @return the EntityManager, or {@code null} if none found
@@ -184,7 +184,7 @@ public static EntityManager getTransactionalEntityManager(EntityManagerFactory e
 	 * Obtain a JPA EntityManager from the given factory. Is aware of a corresponding
 	 * EntityManager bound to the current thread, e.g. when using JpaTransactionManager.
 	 * <p>Same as {@code getEntityManager}, but throwing the original PersistenceException.
-	 * @param emf EntityManagerFactory to create the EntityManager with
+	 * @param emf the EntityManagerFactory to create the EntityManager with
 	 * @param properties the properties to be passed into the {@code createEntityManager}
 	 * call (may be {@code null})
 	 * @return the EntityManager, or {@code null} if none found
@@ -202,7 +202,7 @@ public static EntityManager doGetTransactionalEntityManager(EntityManagerFactory
 	 * Obtain a JPA EntityManager from the given factory. Is aware of a corresponding
 	 * EntityManager bound to the current thread, e.g. when using JpaTransactionManager.
 	 * <p>Same as {@code getEntityManager}, but throwing the original PersistenceException.
-	 * @param emf EntityManagerFactory to create the EntityManager with
+	 * @param emf the EntityManagerFactory to create the EntityManager with
 	 * @param properties the properties to be passed into the {@code createEntityManager}
 	 * call (may be {@code null})
 	 * @param synchronizedWithTransaction whether to automatically join ongoing
@@ -287,7 +287,6 @@ else if (!TransactionSynchronizationManager.isSynchronizationActive()) {
 
 		// Use same EntityManager for further JPA operations within the transaction.
 		// Thread-bound object will get removed by synchronization at transaction completion.
-		logger.debug("Registering transaction synchronization for JPA EntityManager");
 		emHolder = new EntityManagerHolder(em);
 		if (synchronizedWithTransaction) {
 			Object transactionData = prepareTransaction(em, emf);
@@ -347,7 +346,7 @@ private static void cleanupTransaction(Object transactionData, EntityManagerFact
 	 * Apply the current transaction timeout, if any, to the given JPA Query object.
 	 * <p>This method sets the JPA 2.0 query hint "javax.persistence.query.timeout" accordingly.
 	 * @param query the JPA Query object
-	 * @param emf JPA EntityManagerFactory that the Query was created for
+	 * @param emf the JPA EntityManagerFactory that the Query was created for
 	 */
 	public static void applyTransactionTimeout(Query query, EntityManagerFactory emf) {
 		EntityManagerHolder emHolder = (EntityManagerHolder) TransactionSynchronizationManager.getResource(emf);
@@ -432,7 +431,6 @@ public static DataAccessException convertJpaAccessExceptionIfPossible(RuntimeExc
 	 */
 	public static void closeEntityManager(EntityManager em) {
 		if (em != null) {
-			logger.debug("Closing JPA EntityManager");
 			try {
 				if (em.isOpen()) {
 					em.close();

spring-tx/src/main/java/org/springframework/jca/cci/connection/ConnectionFactoryUtils.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2012 the original author or authors.
+ * Copyright 2002-2018 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -127,7 +127,6 @@ public static Connection doGetConnection(ConnectionFactory cf) throws ResourceEx
 		Connection con = cf.getConnection();
 
 		if (TransactionSynchronizationManager.isSynchronizationActive()) {
-			logger.debug("Registering transaction synchronization for CCI Connection");
 			conHolder = new ConnectionHolder(con);
 			conHolder.setSynchronizedWithTransaction(true);
 			TransactionSynchronizationManager.registerSynchronization(new ConnectionSynchronization(conHolder, cf));