From f71c6674f017579a90c1e2591fdbbbcf898d5e0b Mon Sep 17 00:00:00 2001
From: Roman Nevezhyn <nieviezh@amazon.com>
Date: Wed, 16 Dec 2020 12:54:03 -0800
Subject: [PATCH] [AMQ-8104] Fix NPE when pausing queue if audit is on

cherry picked from 651c5ff2cfe72c0de5f4f486c965cdbb80ceba0d
---
 .../activemq/broker/jmx/AnnotatedMBean.java   |  1 +
 .../broker/jmx/MBeanWithAuditLogTest.java     | 44 +++++++++++++++++++
 2 files changed, 45 insertions(+)
 create mode 100644 activemq-unit-tests/src/test/java/org/apache/activemq/broker/jmx/MBeanWithAuditLogTest.java

diff --git a/activemq-broker/src/main/java/org/apache/activemq/broker/jmx/AnnotatedMBean.java b/activemq-broker/src/main/java/org/apache/activemq/broker/jmx/AnnotatedMBean.java
index dc772c266b..dfae72bf10 100644
--- a/activemq-broker/src/main/java/org/apache/activemq/broker/jmx/AnnotatedMBean.java
+++ b/activemq-broker/src/main/java/org/apache/activemq/broker/jmx/AnnotatedMBean.java
@@ -202,6 +202,7 @@ public class AnnotatedMBean extends StandardMBean {
 
     @Override
     public Object invoke(String s, Object[] objects, String[] strings) throws MBeanException, ReflectionException {
+        objects = (objects == null) ? new Object[]{} : objects;
         JMXAuditLogEntry entry = null;
         if (audit != OFF) {
             Subject subject = Subject.getSubject(AccessController.getContext());
diff --git a/activemq-unit-tests/src/test/java/org/apache/activemq/broker/jmx/MBeanWithAuditLogTest.java b/activemq-unit-tests/src/test/java/org/apache/activemq/broker/jmx/MBeanWithAuditLogTest.java
new file mode 100644
index 0000000000..3ec7c92452
--- /dev/null
+++ b/activemq-unit-tests/src/test/java/org/apache/activemq/broker/jmx/MBeanWithAuditLogTest.java
@@ -0,0 +1,44 @@
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License.  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.apache.activemq.broker.jmx;
+
+
+/**
+ * A test case of the various MBeans in ActiveMQ with audit log turned on.
+ */
+public class MBeanWithAuditLogTest extends MBeanTest {
+
+    static final String requiredAuditValue = "all";
+    static final String auditKey = "org.apache.activemq.audit";
+    static final String initialAuditValue = System.getProperty("org.apache.activemq.audit");
+
+    @Override
+    protected void setUp() throws Exception {
+        System.setProperty(auditKey, requiredAuditValue);
+        super.setUp();
+    }
+
+    @Override
+    protected void tearDown() throws Exception {
+        if (initialAuditValue == null) {
+            System.clearProperty(auditKey);
+        } else {
+            System.setProperty(auditKey, initialAuditValue);
+        }
+        super.tearDown();
+    }
+}