Repository: activemq Updated Branches: refs/heads/trunk fdc2551eb -> f70dc7431
https://issues.apache.org/jira/browse/AMQ-5146 - durable sub redelivery test regression https://issues.apache.org/jira/browse/AMQ-5156 - pre delivery check for max redelivery should only apply to transacted sessions Project: http://git-wip-us.apache.org/repos/asf/activemq/repo Commit: http://git-wip-us.apache.org/repos/asf/activemq/commit/f70dc743 Tree: http://git-wip-us.apache.org/repos/asf/activemq/tree/f70dc743 Diff: http://git-wip-us.apache.org/repos/asf/activemq/diff/f70dc743 Branch: refs/heads/trunk Commit: f70dc74312499d9b0c24f02a5bfcf316af4edf3d Parents: fdc2551 Author: gtully <gary.tu...@gmail.com> Authored: Thu Apr 24 10:52:03 2014 +0100 Committer: gtully <gary.tu...@gmail.com> Committed: Thu Apr 24 10:53:33 2014 +0100 ---------------------------------------------------------------------- .../main/java/org/apache/activemq/ActiveMQMessageConsumer.java | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/activemq/blob/f70dc743/activemq-client/src/main/java/org/apache/activemq/ActiveMQMessageConsumer.java ---------------------------------------------------------------------- diff --git a/activemq-client/src/main/java/org/apache/activemq/ActiveMQMessageConsumer.java b/activemq-client/src/main/java/org/apache/activemq/ActiveMQMessageConsumer.java index 89dbc81..e17a1bb 100755 --- a/activemq-client/src/main/java/org/apache/activemq/ActiveMQMessageConsumer.java +++ b/activemq-client/src/main/java/org/apache/activemq/ActiveMQMessageConsumer.java @@ -524,12 +524,13 @@ public class ActiveMQMessageConsumer implements MessageAvailableConsumer, StatsC private boolean redeliveryExceeded(MessageDispatch md) { try { - return redeliveryPolicy != null + return session.getTransacted() + && redeliveryPolicy != null && redeliveryPolicy.getMaximumRedeliveries() != RedeliveryPolicy.NO_MAXIMUM_REDELIVERIES && md.getRedeliveryCounter() > redeliveryPolicy.getMaximumRedeliveries() // redeliveryCounter > x expected after resend via brokerRedeliveryPlugin && md.getMessage().getProperty("redeliveryDelay") == null; - } catch (IOException ignored) { + } catch (Exception ignored) { return false; } }
