From aaecdff8b485dc1baf84110375d4b9ffa6f68c19 Mon Sep 17 00:00:00 2001 From: Timothy Bish Date: Wed, 13 Apr 2016 16:53:00 -0400 Subject: [PATCH] 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 --- .../java/org/apache/activemq/ActiveMQMessageConsumer.java | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) 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 3f5167facd..90ca7c2a24 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()); } }