activemq-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From tab...@apache.org
Subject activemq git commit: https://issues.apache.org/jira/browse/AMQ-6245
Date Wed, 13 Apr 2016 20:53:14 GMT
Repository: activemq
Updated Branches:
  refs/heads/master 82330793e -> aaecdff8b


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

Project: http://git-wip-us.apache.org/repos/asf/activemq/repo
Commit: http://git-wip-us.apache.org/repos/asf/activemq/commit/aaecdff8
Tree: http://git-wip-us.apache.org/repos/asf/activemq/tree/aaecdff8
Diff: http://git-wip-us.apache.org/repos/asf/activemq/diff/aaecdff8

Branch: refs/heads/master
Commit: aaecdff8b485dc1baf84110375d4b9ffa6f68c19
Parents: 8233079
Author: Timothy Bish <tabish121@gmail.com>
Authored: Wed Apr 13 16:53:00 2016 -0400
Committer: Timothy Bish <tabish121@gmail.com>
Committed: Wed Apr 13 16:53:00 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/aaecdff8/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());
                 }
             }


Mime
View raw message