Propagate JMS IllegalStateException from commit/rollbackIfNecessary

jhoeller · jhoeller · commit 0628b479f15d · 2024-03-18T16:25:33.000+01:00
Closes gh-32473 (cherry picked from commit cd7ba18)
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
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2012 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 static void commitIfNecessary(Session session) throws JMSException {
 		try {
 			session.commit();
 		}
-		catch (javax.jms.TransactionInProgressException | javax.jms.IllegalStateException ex) {
+		catch (javax.jms.TransactionInProgressException ex) {
 			// Ignore -> can only happen in case of a JTA transaction.
 		}
 	}
@@ -232,7 +232,7 @@ public static void rollbackIfNecessary(Session session) throws JMSException {
 		try {
 			session.rollback();
 		}
-		catch (javax.jms.TransactionInProgressException | javax.jms.IllegalStateException ex) {
+		catch (javax.jms.TransactionInProgressException ex) {
 			// Ignore -> can only happen in case of a JTA transaction.
 		}
 	}

Original file line number	Diff line number	Diff line change
`@@ -1,5 +1,5 @@`
`1`	`1`	`/*`
`2`		`- * Copyright 2002-2012 the original author or authors.`
	`2`	`+ * Copyright 2002-2024 the original author or authors.`
`3`	`3`	`*`
`4`	`4`	`* Licensed under the Apache License, Version 2.0 (the "License");`
`5`	`5`	`* you may not use this file except in compliance with the License.`
`@@ -217,7 +217,7 @@ public static void commitIfNecessary(Session session) throws JMSException {`
`217`	`217`	`try {`
`218`	`218`	`session.commit();`
`219`	`219`	`}`
`220`		`- catch (javax.jms.TransactionInProgressException \| javax.jms.IllegalStateException ex) {`
	`220`	`+ catch (javax.jms.TransactionInProgressException ex) {`
`221`	`221`	`// Ignore -> can only happen in case of a JTA transaction.`
`222`	`222`	`}`
`223`	`223`	`}`
`@@ -232,7 +232,7 @@ public static void rollbackIfNecessary(Session session) throws JMSException {`
`232`	`232`	`try {`
`233`	`233`	`session.rollback();`
`234`	`234`	`}`
`235`		`- catch (javax.jms.TransactionInProgressException \| javax.jms.IllegalStateException ex) {`
	`235`	`+ catch (javax.jms.TransactionInProgressException ex) {`
`236`	`236`	`// Ignore -> can only happen in case of a JTA transaction.`
`237`	`237`	`}`
`238`	`238`	`}`