QPID-6263 : [Java Broker] Move startup/recovery logic from server.Broker to SystemConfig

git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk@1643719 13f79535-47bb-0310-9956-ffa450edef68

1 files changed, 12 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 76f8485884..f4c6926a17 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
@@ -41,6 +41,7 @@ import org.apache.log4j.Logger;
 import org.apache.qpid.common.QpidProperties;
 import org.apache.qpid.framing.ProtocolVersion;
 import org.apache.qpid.server.configuration.IllegalConfigurationException;
+import org.apache.qpid.server.util.Action;
 import org.apache.qpid.util.FileUtils;
 
 /**
@@ -454,7 +455,17 @@ public class Main
 
     protected void startBroker(final BrokerOptions options) throws Exception
     {
-        Broker broker = new Broker(true);
+        Broker broker = new Broker(new Action<Integer>()
+                                    {
+                                        @Override
+                                        public void performAction(final Integer exitStatusCode)
+                                        {
+                                            if (exitStatusCode != 0)
+                                            {
+                                                shutdown(exitStatusCode);
+                                            }
+                                        }
+                                    });
         broker.startup(options);
     }