Merge pull request spring-projects#32610 from alidandach

* pr/32610: Polish "Use try-with-resources when applicable" Use try-with-resources when applicable Closes spring-projectsgh-32610
sbrannen · Apr 10, 2024 · 3d85ec2 · 3d85ec2
2 parents 2d40868 + 330dcf1
commit 3d85ec2
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 8 deletions.
diff --git a/spring-jms/src/main/java/org/springframework/jms/connection/SingleConnectionFactory.java b/spring-jms/src/main/java/org/springframework/jms/connection/SingleConnectionFactory.java
@@ -575,14 +575,11 @@ protected void closeConnection(Connection con) {
 			logger.debug("Closing shared JMS Connection: " + con);
 		}
 		try {
-			try {
+			try (con) {
 				if (this.startedCount > 0) {
 					con.stop();
 				}
 			}
-			finally {
-				con.close();
-			}
 		}
 		catch (jakarta.jms.IllegalStateException ex) {
 			logger.debug("Ignoring Connection state exception - assuming already closed: " + ex);

diff --git a/spring-jms/src/main/java/org/springframework/jms/support/JmsUtils.java b/spring-jms/src/main/java/org/springframework/jms/support/JmsUtils.java
@@ -74,12 +74,9 @@ public static void closeConnection(@Nullable Connection con, boolean stop) {
 		if (con != null) {
 			try {
 				if (stop) {
-					try {
+					try (con) {
 						con.stop();
 					}
-					finally {
-						con.close();
-					}
 				}
 				else {
 					con.close();