Apache
/
activemq
mirror of https://github.com/apache/activemq.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

resolve regression in FailoverTransactionTest following change to fix resolve https://issues.apache.org/activemq/browse/AMQ-2751, fix needs to be conditional on delayed delivery otherwise it can effect async transacted redelivery on failover 

git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@949789 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
Gary Tully 2010-05-31 16:12:06 +00:00
parent 72015ca681
commit 7f0ced9402
1 changed files with 4 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
activemq-core/src/main/java/org/apache/activemq/ActiveMQMessageConsumer.java
View File

@ -1232,7 +1232,10 @@ public class ActiveMQMessageConsumer implements MessageAvailableConsumer, StatsC
} }
} }
} else { } else {
session.connection.rollbackDuplicate(this, md.getMessage()); if (!unconsumedMessages.isRunning()) {
// delayed redelivery, ensure it can be re delivered
session.connection.rollbackDuplicate(this, md.getMessage());
}
unconsumedMessages.enqueue(md); unconsumedMessages.enqueue(md);
if (availableListener != null) { if (availableListener != null) {
availableListener.onMessageAvailable(this); availableListener.onMessageAvailable(this);