[activemq-artemis] branch master updated: ARTEMIS-2640 mgmnt ops reporting wrong audit details

[clebertsuconic]

This is an automated email from the ASF dual-hosted git repository.

clebertsuconic pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/activemq-artemis.git


The following commit(s) were added to refs/heads/master by this push:
     new b2417d3  ARTEMIS-2640 mgmnt ops reporting wrong audit details
     new b156b7d  This closes #2997
b2417d3 is described below

commit b2417d33b1a5aa1bb46736fe2e0c51f909314b67
Author: Justin Bertram <jbert...@apache.org>
AuthorDate: Tue Mar 3 14:03:55 2020 -0600

    ARTEMIS-2640 mgmnt ops reporting wrong audit details
---
 .../core/management/impl/ActiveMQServerControlImpl.java        | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git 
a/artemis-server/src/main/java/org/apache/activemq/artemis/core/management/impl/ActiveMQServerControlImpl.java
 
b/artemis-server/src/main/java/org/apache/activemq/artemis/core/management/impl/ActiveMQServerControlImpl.java
index cb57760..2f6407c 100644
--- 
a/artemis-server/src/main/java/org/apache/activemq/artemis/core/management/impl/ActiveMQServerControlImpl.java
+++ 
b/artemis-server/src/main/java/org/apache/activemq/artemis/core/management/impl/ActiveMQServerControlImpl.java
@@ -1119,10 +1119,10 @@ public class ActiveMQServerControlImpl extends 
AbstractControl implements Active
                              boolean autoCreateAddress,
                              long ringSize) throws Exception {
       if (AuditLogger.isEnabled()) {
-         AuditLogger.createQueue(this.server, address, routingType, name, 
filterStr, durable,
-                  maxConsumers, purgeOnNoConsumers, exclusive, groupBuckets, 
lastValue,
-                  lastValueKey, nonDestructive, consumersBeforeDispatch, 
delayBeforeDispatch, autoDelete,
-                  autoDeleteDelay, autoDeleteMessageCount, autoCreateAddress, 
ringSize);
+         AuditLogger.createQueue(this.server, null, address, routingType, 
name, filterStr, durable,
+                  maxConsumers, purgeOnNoConsumers, exclusive, groupRebalance, 
groupBuckets, groupFirstKey,
+                  lastValue, lastValueKey, nonDestructive, 
consumersBeforeDispatch, delayBeforeDispatch,
+                  autoDelete, autoDeleteDelay, autoDeleteMessageCount, 
autoCreateAddress, ringSize);
       }
       checkStarted();
 
@@ -1361,7 +1361,7 @@ public class ActiveMQServerControlImpl extends 
AbstractControl implements Active
    @Override
    public void destroyQueue(final String name, final boolean removeConsumers, 
final boolean autoDeleteAddress) throws Exception {
       if (AuditLogger.isEnabled()) {
-         AuditLogger.destroyQueue(this.server, name, removeConsumers, 
autoDeleteAddress);
+         AuditLogger.destroyQueue(this.server, null, name, removeConsumers, 
autoDeleteAddress);
       }
       checkStarted();