diff options
| -rw-r--r-- | java/broker/src/main/java/org/apache/qpid/server/Main.java | 2 | ||||
| -rw-r--r-- | java/broker/src/main/java/org/apache/qpid/server/registry/ConfigurationFileApplicationRegistry.java | 4 |
2 files changed, 4 insertions, 2 deletions
diff --git a/java/broker/src/main/java/org/apache/qpid/server/Main.java b/java/broker/src/main/java/org/apache/qpid/server/Main.java index ff604bdc82..eac027afc6 100644 --- a/java/broker/src/main/java/org/apache/qpid/server/Main.java +++ b/java/broker/src/main/java/org/apache/qpid/server/Main.java @@ -298,8 +298,6 @@ public class Main _brokerLogger.info("Starting Qpid Broker " + QpidProperties.getReleaseVersion() + " build: " + QpidProperties.getBuildVersion()); - CurrentActor.get().message(BrokerMessages.BRK_1001(QpidProperties.getReleaseVersion(),QpidProperties.getBuildVersion())); - ByteBuffer.setUseDirectBuffers(serverConfig.getEnableDirectBuffers()); // the MINA default is currently to use the pooled allocator although this may change in future diff --git a/java/broker/src/main/java/org/apache/qpid/server/registry/ConfigurationFileApplicationRegistry.java b/java/broker/src/main/java/org/apache/qpid/server/registry/ConfigurationFileApplicationRegistry.java index 25202460c0..a049d1eb09 100644 --- a/java/broker/src/main/java/org/apache/qpid/server/registry/ConfigurationFileApplicationRegistry.java +++ b/java/broker/src/main/java/org/apache/qpid/server/registry/ConfigurationFileApplicationRegistry.java @@ -22,8 +22,10 @@ package org.apache.qpid.server.registry; import org.apache.commons.configuration.ConfigurationException; import org.apache.qpid.AMQException; +import org.apache.qpid.common.QpidProperties; import org.apache.qpid.server.configuration.ServerConfiguration; import org.apache.qpid.server.logging.RootMessageLoggerImpl; +import org.apache.qpid.server.logging.messages.BrokerMessages; import org.apache.qpid.server.logging.actors.CurrentActor; import org.apache.qpid.server.logging.actors.BrokerActor; import org.apache.qpid.server.logging.rawloggers.Log4jMessageLogger; @@ -53,6 +55,8 @@ public class ConfigurationFileApplicationRegistry extends ApplicationRegistry // Set the Actor for current log messages CurrentActor.set(new BrokerActor(_rootMessageLogger)); + CurrentActor.get().message(BrokerMessages.BRK_1001(QpidProperties.getReleaseVersion(),QpidProperties.getBuildVersion())); + initialiseManagedObjectRegistry(); _virtualHostRegistry = new VirtualHostRegistry(this); |