root
/
spring-framework
mirror of https://github.com/spring-projects/spring-framework.git
1
0
Fork 0
Code Issues Actions 2 Packages Projects Releases Wiki Activity

Raise log level for exceptions from EntityManager close call 

Closes gh-24501
This commit is contained in:
Juergen Hoeller 2020-02-12 16:48:42 +01:00
parent b889700548
commit e0319b1f79
4 changed files with 9 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
spring-jms/src/main/java/org/springframework/jms/connection/SingleConnectionFactory.java
View File

@ -1,5 +1,5 @@
/* /*
* Copyright 2002-2018 the original author or authors. * Copyright 2002-2020 the original author or authors.
* *
* Licensed under the Apache License, Version 2.0 (the "License"); * Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License. * you may not use this file except in compliance with the License.
@ -505,7 +505,7 @@ public class SingleConnectionFactory implements ConnectionFactory, QueueConnecti
logger.debug("Ignoring Connection state exception - assuming already closed: " + ex); logger.debug("Ignoring Connection state exception - assuming already closed: " + ex);
} }
catch (Throwable ex) { catch (Throwable ex) {
logger.debug("Could not close shared JMS Connection", ex); logger.warn("Could not close shared JMS Connection", ex);
} }
} }

7
spring-orm/src/main/java/org/springframework/orm/hibernate5/SessionFactoryUtils.java
View File

@ -1,5 +1,5 @@
/* /*
* Copyright 2002-2018 the original author or authors. * Copyright 2002-2020 the original author or authors.
* *
* Licensed under the Apache License, Version 2.0 (the "License"); * Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License. * you may not use this file except in compliance with the License.
@ -170,11 +170,8 @@ public abstract class SessionFactoryUtils {
try { try {
session.close(); session.close();
} }
catch (HibernateException ex) {
logger.debug("Could not close Hibernate Session", ex);
}
catch (Throwable ex) { catch (Throwable ex) {
logger.debug("Unexpected exception on closing Hibernate Session", ex); logger.error("Failed to release Hibernate Session", ex);
} }
} }
} }

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

@ -1,5 +1,5 @@
/* /*
* Copyright 2002-2018 the original author or authors. * Copyright 2002-2020 the original author or authors.
* *
* Licensed under the Apache License, Version 2.0 (the "License"); * Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License. * you may not use this file except in compliance with the License.
@ -427,11 +427,8 @@ public abstract class EntityManagerFactoryUtils {
em.close(); em.close();
} }
} }
catch (PersistenceException ex) {
logger.debug("Could not close JPA EntityManager", ex);
}
catch (Throwable ex) { catch (Throwable ex) {
logger.debug("Unexpected exception on closing JPA EntityManager", ex); logger.error("Failed to release JPA EntityManager", ex);
} }
} }
} }

6
spring-orm/src/main/java/org/springframework/orm/jpa/JpaTransactionManager.java
View File

@ -1,5 +1,5 @@
/* /*
* Copyright 2002-2019 the original author or authors. * Copyright 2002-2020 the original author or authors.
* *
* Licensed under the Apache License, Version 2.0 (the "License"); * Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License. * you may not use this file except in compliance with the License.
@ -604,9 +604,9 @@ public class JpaTransactionManager extends AbstractPlatformTransactionManager
getJpaDialect().releaseJdbcConnection(conHandle, getJpaDialect().releaseJdbcConnection(conHandle,
txObject.getEntityManagerHolder().getEntityManager()); txObject.getEntityManagerHolder().getEntityManager());
} }
catch (Exception ex) { catch (Throwable ex) {
// Just log it, to keep a transaction-related exception. // Just log it, to keep a transaction-related exception.
logger.error("Could not close JDBC connection after transaction", ex); logger.error("Failed to release JDBC connection after transaction", ex);
} }
} }
} }