From 7854b7ac401af4f332be3e7fff0f16abee7f2b30 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 --- .../org/springframework/jdbc/datasource/DataSourceUtils.java | 4 +--- .../springframework/orm/jpa/EntityManagerFactoryUtils.java | 2 -- .../jca/cci/connection/ConnectionFactoryUtils.java | 3 +-- 3 files changed, 2 insertions(+), 7 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 a4778b5d9b..e7f0713aaf 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. @@ -115,7 +115,6 @@ public abstract class DataSourceUtils { Connection con = fetchConnection(dataSource); 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; @@ -337,7 +336,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 158c1a0f62..a6fa99c6bc 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 @@ -268,7 +268,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); @@ -415,7 +414,6 @@ public abstract class EntityManagerFactoryUtils { */ public static void closeEntityManager(@Nullable 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 c7d54f62ae..93e6ae158e 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-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. @@ -128,7 +128,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));