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 2b52e7d751d..36ad856f848 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); 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 3c6f49a2667..b4815924fa1 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();