mirror of https://github.com/apache/activemq.git
Merge pull request #592 from nevezhyn/master
[AMQ-8104] Tests and fixes NullPointerException when pause queue if audit log is turned on
This commit is contained in:
commit
bdba415b89
|
@ -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());
|
||||
|
|
|
@ -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();
|
||||
}
|
||||
}
|
Loading…
Reference in New Issue