You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@activemq.apache.org by gt...@apache.org on 2017/06/15 10:22:37 UTC

activemq git commit: [AMQ-6703] check for enable audit false

Repository: activemq
Updated Branches:
  refs/heads/master 99f3d4c50 -> df3bd83c0


[AMQ-6703] check for enable audit false


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

Branch: refs/heads/master
Commit: df3bd83c0d851c2aa043d1d3cd3aa1d909561694
Parents: 99f3d4c
Author: gtully <ga...@gmail.com>
Authored: Thu Jun 15 11:22:20 2017 +0100
Committer: gtully <ga...@gmail.com>
Committed: Thu Jun 15 11:22:20 2017 +0100

----------------------------------------------------------------------
 .../src/main/java/org/apache/activemq/broker/region/Queue.java   | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/activemq/blob/df3bd83c/activemq-broker/src/main/java/org/apache/activemq/broker/region/Queue.java
----------------------------------------------------------------------
diff --git a/activemq-broker/src/main/java/org/apache/activemq/broker/region/Queue.java b/activemq-broker/src/main/java/org/apache/activemq/broker/region/Queue.java
index 1bdfe70..612aeeb 100644
--- a/activemq-broker/src/main/java/org/apache/activemq/broker/region/Queue.java
+++ b/activemq-broker/src/main/java/org/apache/activemq/broker/region/Queue.java
@@ -1280,7 +1280,9 @@ public class Queue extends BaseDestination implements Task, UsageListener, Index
                 // store
             } while (!list.isEmpty() && this.destinationStatistics.getMessages().getCount() > 0);
 
-            getMessages().getMessageAudit().clear();
+            if (getMessages().getMessageAudit() != null) {
+                getMessages().getMessageAudit().clear();
+            }
 
             if (this.destinationStatistics.getMessages().getCount() > 0) {
                 LOG.warn("{} after purge of {} messages, message count stats report: {}", getActiveMQDestination().getQualifiedName(), originalMessageCount, this.destinationStatistics.getMessages().getCount());