diff options
| author | Alex Rudyy <orudyy@apache.org> | 2013-02-26 12:34:13 +0000 |
|---|---|---|
| committer | Alex Rudyy <orudyy@apache.org> | 2013-02-26 12:34:13 +0000 |
| commit | 4dff8d8a0cf6a34529a80610c4a8b6e73eefd2dc (patch) | |
| tree | 93217c57262290b35f05e4f14a3d80ef1ebf31d7 /java/broker-plugins | |
| parent | c1387aa47ec51604fa8664ebe4af370f7a6b67e3 (diff) | |
| download | qpid-python-4dff8d8a0cf6a34529a80610c4a8b6e73eefd2dc.tar.gz | |
QPID-4602: Fix broker startup when default log4j configuration is used and fix java system tests to pass correctly log4j configuration path to the spawn broker if it contains spaces.
git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk/qpid@1450151 13f79535-47bb-0310-9956-ffa450edef68
Diffstat (limited to 'java/broker-plugins')
| -rw-r--r-- | java/broker-plugins/management-jmx/src/main/java/org/apache/qpid/server/jmx/JMXManagement.java | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/java/broker-plugins/management-jmx/src/main/java/org/apache/qpid/server/jmx/JMXManagement.java b/java/broker-plugins/management-jmx/src/main/java/org/apache/qpid/server/jmx/JMXManagement.java index 45d642e4f7..8f087ba50c 100644 --- a/java/broker-plugins/management-jmx/src/main/java/org/apache/qpid/server/jmx/JMXManagement.java +++ b/java/broker-plugins/management-jmx/src/main/java/org/apache/qpid/server/jmx/JMXManagement.java @@ -187,7 +187,10 @@ public class JMXManagement extends AbstractPluginAdapter implements Configuratio } new Shutdown(_objectRegistry); new ServerInformationMBean(_objectRegistry, _broker); - new LoggingManagementMBean(LoggingManagementFacade.getCurrentInstance(), _objectRegistry); + if (LoggingManagementFacade.getCurrentInstance() != null) + { + new LoggingManagementMBean(LoggingManagementFacade.getCurrentInstance(), _objectRegistry); + } _objectRegistry.start(); } |