Spring/spring-framework
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge branch '5.3.x'

Browse Source 
# Conflicts:
#	build.gradle
#	spring-orm/src/main/java/org/springframework/orm/hibernate5/SessionFactoryUtils.java
This commit is contained in:
Juergen Hoeller
2022-01-26 00:06:12 +01:00
parent 48ce714d15 1272cd557d
commit 065ac8e081
2 changed files with 17 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -1,5 +1,5 @@
/*
* Copyright 2002-2021 the original author or authors.
* Copyright 2002-2022 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.
@@ -133,7 +133,9 @@ public abstract class SessionFactoryUtils {
public static void closeSession(@Nullable Session session) {
if (session != null) {
try {
session.close();
if (session.isOpen()) {
session.close();
}
}
catch (Throwable ex) {
logger.error("Failed to release Hibernate Session", ex);