root
/
spring-framework
mirror of https://github.com/spring-projects/spring-framework.git
1
0
Fork 0
Code Issues Actions 4 Packages Projects Releases Wiki Activity

AbstractMessageListenerContainer calls "Session.recover()" in case of rollback attempt on non-transacted Session 

Issue: SPR-12015
This commit is contained in:
Juergen Hoeller 2014-07-22 16:50:41 +02:00
parent 5e2fbe7355
commit c082220b34
1 changed files with 18 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -711,9 +711,14 @@ public abstract class AbstractMessageListenerContainer
* @throws javax.jms.JMSException in case of a rollback error * @throws javax.jms.JMSException in case of a rollback error
*/ */
protected void rollbackIfNecessary(Session session) throws JMSException { protected void rollbackIfNecessary(Session session) throws JMSException {
if (session.getTransacted() && isSessionLocallyTransacted(session)) { if (session.getTransacted()) {
// Transacted session created by this container -> rollback. if (isSessionLocallyTransacted(session)) {
JmsUtils.rollbackIfNecessary(session); // Transacted session created by this container -> rollback.
JmsUtils.rollbackIfNecessary(session);
}
}
else {
session.recover();
} }
} }
@ -725,12 +730,17 @@ public abstract class AbstractMessageListenerContainer
*/ */
protected void rollbackOnExceptionIfNecessary(Session session, Throwable ex) throws JMSException { protected void rollbackOnExceptionIfNecessary(Session session, Throwable ex) throws JMSException {
try { try {
if (session.getTransacted() && isSessionLocallyTransacted(session)) { if (session.getTransacted()) {
// Transacted session created by this container -> rollback. if (isSessionLocallyTransacted(session)) {
if (logger.isDebugEnabled()) { // Transacted session created by this container -> rollback.
logger.debug("Initiating transaction rollback on application exception", ex); if (logger.isDebugEnabled()) {
logger.debug("Initiating transaction rollback on application exception", ex);
}
JmsUtils.rollbackIfNecessary(session);
} }
JmsUtils.rollbackIfNecessary(session); }
else {
session.recover();
} }
} }
catch (IllegalStateException ex2) { catch (IllegalStateException ex2) {