From cd7ba1835cfeb37c0a28f1eba97a9956697b1623 Mon Sep 17 00:00:00 2001 From: Juergen Hoeller Date: Mon, 18 Mar 2024 16:03:13 +0100 Subject: [PATCH] Propagate JMS IllegalStateException from commit/rollbackIfNecessary Closes gh-32473 --- .../main/java/org/springframework/jms/support/JmsUtils.java | 6 +++--- 1 file changed, 3 insertions(+), 3 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 bcbf6fbad1..1c3c8084b7 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 @@ -1,5 +1,5 @@ /* - * Copyright 2002-2023 the original author or authors. + * Copyright 2002-2024 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. @@ -217,7 +217,7 @@ public abstract class JmsUtils { try { session.commit(); } - catch (jakarta.jms.TransactionInProgressException | jakarta.jms.IllegalStateException ex) { + catch (jakarta.jms.TransactionInProgressException ex) { // Ignore -> can only happen in case of a JTA transaction. } } @@ -232,7 +232,7 @@ public abstract class JmsUtils { try { session.rollback(); } - catch (jakarta.jms.TransactionInProgressException | jakarta.jms.IllegalStateException ex) { + catch (jakarta.jms.TransactionInProgressException ex) { // Ignore -> can only happen in case of a JTA transaction. } }