This is an automated email from the ASF dual-hosted git repository.
jbonofre pushed a commit to branch activemq-5.15.x
in repository https://gitbox.apache.org/repos/asf/activemq.git
The following commit(s) were added to refs/heads/activemq-5.15.x by this push:
new 748ade7 [AMQ-8104] Fix NPE when queue pausing with audit log enabled
748ade7 is described below
commit 748ade7deb5d50359e64af8b9a738f3071faa9ef
Author: Roman Nevezhyn <[email protected]>
AuthorDate: Wed Dec 16 12:54:03 2020 -0800
[AMQ-8104] Fix NPE when queue pausing with audit log enabled
cherry picked from commit 651c5ff2cfe72c0de5f4f486c965cdbb80ceba0d
---
.../apache/activemq/broker/jmx/AnnotatedMBean.java | 1 +
.../activemq/broker/jmx/MBeanWithAuditLogTest.java | 44 ++++++++++++++++++++++
2 files changed, 45 insertions(+)
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 dc772c2..dfae72b 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 0000000..3ec7c92
--- /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();
+ }
+}
