From df3bd83c0d851c2aa043d1d3cd3aa1d909561694 Mon Sep 17 00:00:00 2001 From: gtully Date: Thu, 15 Jun 2017 11:22:20 +0100 Subject: [PATCH] [AMQ-6703] check for enable audit false --- .../main/java/org/apache/activemq/broker/region/Queue.java | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) 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 1bdfe70e26..612aeeb7e5 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());