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 | c1a3d6e2927975d83f683334360f613b9fb44189 (patch) | |
| tree | 7ee41f099361d7d9862b26016099b7a9ebb755d8 /qpid/java/broker-plugins | |
| parent | f40d09db7c96b8050cabf4783f067a1cfe1e5c5d (diff) | |
| download | qpid-python-c1a3d6e2927975d83f683334360f613b9fb44189.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@1450151 13f79535-47bb-0310-9956-ffa450edef68
Diffstat (limited to 'qpid/java/broker-plugins')
| -rw-r--r-- | qpid/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/qpid/java/broker-plugins/management-jmx/src/main/java/org/apache/qpid/server/jmx/JMXManagement.java b/qpid/java/broker-plugins/management-jmx/src/main/java/org/apache/qpid/server/jmx/JMXManagement.java index 45d642e4f7..8f087ba50c 100644 --- a/qpid/java/broker-plugins/management-jmx/src/main/java/org/apache/qpid/server/jmx/JMXManagement.java +++ b/qpid/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(); } |