From 82b51479d5761f0b97423c1cbb76ce6953f7185c Mon Sep 17 00:00:00 2001 From: ali dandach Date: Wed, 10 Apr 2024 01:29:21 +0300 Subject: [PATCH 1/2] Use try-with-resources when applicable See gh-32610 --- .../jms/connection/SingleConnectionFactory.java | 5 +---- 1 file changed, 1 insertion(+), 4 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 index 2b52e7d751..36ad856f84 100644 --- 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 @@ public class SingleConnectionFactory implements ConnectionFactory, QueueConnecti 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); From 330dcf15bc4ff0a93e8e244ec20e46c016df0535 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?St=C3=A9phane=20Nicoll?= Date: Wed, 10 Apr 2024 09:49:35 +0200 Subject: [PATCH 2/2] Polish "Use try-with-resources when applicable" See gh-32610 --- .../main/java/org/springframework/jms/support/JmsUtils.java | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) 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 index 3c6f49a266..b4815924fa 100644 --- 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 abstract class JmsUtils { if (con != null) { try { if (stop) { - try { + try (con) { con.stop(); } - finally { - con.close(); - } } else { con.close();