Spring/spring-framework
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Polish: combine catches block with same body

Browse Source
This commit is contained in:
igor-suhorukov
2018-02-27 09:02:34 +03:00
committed by Juergen Hoeller
parent f835f7b500
commit 7bce04c06c
10 changed files with 11 additions and 52 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
spring-jms/src/main/java/org/springframework/jms/listener/AbstractMessageListenerContainer.java
View File

@@ -673,18 +673,10 @@ public abstract class AbstractMessageListenerContainer extends AbstractJmsListen
try {
invokeListener(session, message);
}
catch (JMSException ex) {
catch (JMSException | RuntimeException | Error ex) {
rollbackOnExceptionIfNecessary(session, ex);
throw ex;
}
catch (RuntimeException ex) {
rollbackOnExceptionIfNecessary(session, ex);
throw ex;
}
catch (Error err) {
rollbackOnExceptionIfNecessary(session, err);
throw err;
}
commitIfNecessary(session, message);
}

10
spring-jms/src/main/java/org/springframework/jms/support/JmsUtils.java
View File

@@ -217,10 +217,7 @@ public abstract class JmsUtils {
try {
session.commit();
}
catch (javax.jms.TransactionInProgressException ex) {
// Ignore -> can only happen in case of a JTA transaction.
}
catch (javax.jms.IllegalStateException ex) {
catch (javax.jms.TransactionInProgressException | javax.jms.IllegalStateException ex) {
// Ignore -> can only happen in case of a JTA transaction.
}
}
@@ -235,10 +232,7 @@ public abstract class JmsUtils {
try {
session.rollback();
}
catch (javax.jms.TransactionInProgressException ex) {
// Ignore -> can only happen in case of a JTA transaction.
}
catch (javax.jms.IllegalStateException ex) {
catch (javax.jms.TransactionInProgressException | javax.jms.IllegalStateException ex) {
// Ignore -> can only happen in case of a JTA transaction.
}
}