Repository: activemq Updated Branches: refs/heads/activemq-5.13.x 7894d8a9a -> 857254b75
https://issues.apache.org/jira/browse/AMQ-6245 Don't log the pull timed out messages that might still be in the unconsumed list during rollback of unconsumed messages (cherry picked from commit aaecdff8b485dc1baf84110375d4b9ffa6f68c19) Project: http://git-wip-us.apache.org/repos/asf/activemq/repo Commit: http://git-wip-us.apache.org/repos/asf/activemq/commit/857254b7 Tree: http://git-wip-us.apache.org/repos/asf/activemq/tree/857254b7 Diff: http://git-wip-us.apache.org/repos/asf/activemq/diff/857254b7 Branch: refs/heads/activemq-5.13.x Commit: 857254b75bfd4544e61e61c370c97866d0824bca Parents: 7894d8a Author: Timothy Bish <[email protected]> Authored: Wed Apr 13 16:53:00 2016 -0400 Committer: Timothy Bish <[email protected]> Committed: Wed Apr 13 16:59:39 2016 -0400 ---------------------------------------------------------------------- .../main/java/org/apache/activemq/ActiveMQMessageConsumer.java | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/activemq/blob/857254b7/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 3f5167f..90ca7c2 100755 --- a/activemq-client/src/main/java/org/apache/activemq/ActiveMQMessageConsumer.java +++ b/activemq-client/src/main/java/org/apache/activemq/ActiveMQMessageConsumer.java @@ -863,7 +863,9 @@ public class ActiveMQMessageConsumer implements MessageAvailableConsumer, StatsC if (!this.info.isBrowser()) { for (MessageDispatch old : list) { // ensure we don't filter this as a duplicate - LOG.debug("on close, rollback duplicate: {}", old.getMessage().getMessageId()); + if (old.getMessage() != null) { + LOG.debug("on close, rollback duplicate: {}", old.getMessage().getMessageId()); + } session.connection.rollbackDuplicate(this, old.getMessage()); } }
