summaryrefslogtreecommitdiff
path: root/qpid/java/broker/src
diff options
context:
space:
mode:
authorAlex Rudyy <orudyy@apache.org>2014-10-14 12:37:36 +0000
committerAlex Rudyy <orudyy@apache.org>2014-10-14 12:37:36 +0000
commit0f39dd49ce883571634db47d29a3b5c591439e45 (patch)
treea0143899b03b069733d4ba9cd8fea862689fbee3 /qpid/java/broker/src
parentf3ca13445de8000f96c259274b175e0b49c388ac (diff)
downloadqpid-python-0f39dd49ce883571634db47d29a3b5c591439e45.tar.gz
QPID-6142: Fix NPE thrown on startup when broker fails to start due to CO validation exceptions
git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk@1631732 13f79535-47bb-0310-9956-ffa450edef68
Diffstat (limited to 'qpid/java/broker/src')
-rw-r--r--qpid/java/broker/src/main/java/org/apache/qpid/server/Main.java2
1 files changed, 1 insertions, 1 deletions
diff --git a/qpid/java/broker/src/main/java/org/apache/qpid/server/Main.java b/qpid/java/broker/src/main/java/org/apache/qpid/server/Main.java
index d6b8a25b8a..76f8485884 100644
--- a/qpid/java/broker/src/main/java/org/apache/qpid/server/Main.java
+++ b/qpid/java/broker/src/main/java/org/apache/qpid/server/Main.java
@@ -454,7 +454,7 @@ public class Main
protected void startBroker(final BrokerOptions options) throws Exception
{
- Broker broker = new Broker();
+ Broker broker = new Broker(true);
broker.startup(options);
}