From 9d504c8e1d15adaa294f0d6978b0ddeeca600faf Mon Sep 17 00:00:00 2001 From: Juergen Hoeller Date: Mon, 3 Dec 2018 23:50:50 +0100 Subject: [PATCH] Avoid log statements between resource opening and returning Issue: SPR-17559 (cherry picked from commit 7854b7ac401af4f332be3e7fff0f16abee7f2b30) --- .../jdbc/datasource/DataSourceUtils.java | 4 +--- .../orm/jpa/EntityManagerFactoryUtils.java | 12 +++++------- .../jca/cci/connection/ConnectionFactoryUtils.java | 3 +-- 3 files changed, 7 insertions(+), 12 deletions(-) diff --git a/spring-jdbc/src/main/java/org/springframework/jdbc/datasource/DataSourceUtils.java b/spring-jdbc/src/main/java/org/springframework/jdbc/datasource/DataSourceUtils.java index 3da36f7535..bd0b90192e 100644 --- a/spring-jdbc/src/main/java/org/springframework/jdbc/datasource/DataSourceUtils.java +++ b/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 abstract class DataSourceUtils { 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 abstract class DataSourceUtils { return; } } - logger.debug("Returning JDBC Connection to DataSource"); doCloseConnection(con, dataSource); } diff --git a/spring-orm/src/main/java/org/springframework/orm/jpa/EntityManagerFactoryUtils.java b/spring-orm/src/main/java/org/springframework/orm/jpa/EntityManagerFactoryUtils.java index ccbb9efe2f..31fe898e58 100644 --- a/spring-orm/src/main/java/org/springframework/orm/jpa/EntityManagerFactoryUtils.java +++ b/spring-orm/src/main/java/org/springframework/orm/jpa/EntityManagerFactoryUtils.java @@ -148,7 +148,7 @@ public abstract class EntityManagerFactoryUtils { * Obtain a JPA EntityManager from the given factory. Is aware of a corresponding * EntityManager bound to the current thread, e.g. when using JpaTransactionManager. *

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 abstract class EntityManagerFactoryUtils { * Obtain a JPA EntityManager from the given factory. Is aware of a corresponding * EntityManager bound to the current thread, e.g. when using JpaTransactionManager. *

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 abstract class EntityManagerFactoryUtils { * Obtain a JPA EntityManager from the given factory. Is aware of a corresponding * EntityManager bound to the current thread, e.g. when using JpaTransactionManager. *

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 abstract class EntityManagerFactoryUtils { * Obtain a JPA EntityManager from the given factory. Is aware of a corresponding * EntityManager bound to the current thread, e.g. when using JpaTransactionManager. *

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 @@ public abstract class EntityManagerFactoryUtils { // 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 @@ public abstract class EntityManagerFactoryUtils { * Apply the current transaction timeout, if any, to the given JPA Query object. *

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 abstract class EntityManagerFactoryUtils { */ public static void closeEntityManager(EntityManager em) { if (em != null) { - logger.debug("Closing JPA EntityManager"); try { if (em.isOpen()) { em.close(); diff --git a/spring-tx/src/main/java/org/springframework/jca/cci/connection/ConnectionFactoryUtils.java b/spring-tx/src/main/java/org/springframework/jca/cci/connection/ConnectionFactoryUtils.java index 482a8dc0c9..c2eea53232 100644 --- a/spring-tx/src/main/java/org/springframework/jca/cci/connection/ConnectionFactoryUtils.java +++ b/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 abstract class ConnectionFactoryUtils { 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));