1 files changed, 31 insertions, 11 deletions
diff --git a/qpid/java/broker-core/src/main/java/org/apache/qpid/server/model/AbstractSystemConfig.java b/qpid/java/broker-core/src/main/java/org/apache/qpid/server/model/AbstractSystemConfig.java
index b421c5aaf1..c6ac7d4073 100644
--- a/qpid/java/broker-core/src/main/java/org/apache/qpid/server/model/AbstractSystemConfig.java
+++ b/qpid/java/broker-core/src/main/java/org/apache/qpid/server/model/AbstractSystemConfig.java
@@ -31,6 +31,9 @@ import java.util.HashMap;
 import java.util.Map;
 import java.util.UUID;
 
+import com.google.common.util.concurrent.ListenableFuture;
+import com.google.common.util.concurrent.SettableFuture;
+
 import org.apache.qpid.common.QpidProperties;
 import org.apache.qpid.server.configuration.IllegalConfigurationException;
 import org.apache.qpid.server.configuration.store.ManagementModeStoreHandler;
@@ -194,11 +197,11 @@ public abstract class AbstractSystemConfig<X extends SystemConfig<X>>
     }
 
     @StateTransition(currentState = State.UNINITIALIZED, desiredState = State.ACTIVE)
-    protected void activate()
+    protected ListenableFuture<Void> activate()
     {
         final EventLogger eventLogger = _eventLogger;
 
-        EventLogger startupLogger;
+        final EventLogger startupLogger;
         if (isStartupLoggedToSystemOut())
         {
             //Create the composite (logging+SystemOut MessageLogger to be used during startup
@@ -232,17 +235,34 @@ public abstract class AbstractSystemConfig<X extends SystemConfig<X>>
         BrokerStoreUpgraderAndRecoverer upgrader = new BrokerStoreUpgraderAndRecoverer(this);
         upgrader.perform();
 
-        Broker broker = getBroker();
+        final Broker broker = getBroker();
 
         broker.setEventLogger(startupLogger);
-        broker.open();
-
-        if (broker.getState() == State.ACTIVE)
-        {
-            startupLogger.message(BrokerMessages.READY());
-            broker.setEventLogger(eventLogger);
-        }
-
+        final SettableFuture<Void> returnVal = SettableFuture.create();
+        broker.openAsync().addListener(
+                new Runnable()
+                {
+                    @Override
+                    public void run()
+                    {
+                        try
+                        {
+
+                            if (broker.getState() == State.ACTIVE)
+                            {
+                                startupLogger.message(BrokerMessages.READY());
+                                broker.setEventLogger(eventLogger);
+                            }
+                        }
+                        finally
+                        {
+                            returnVal.set(null);
+                        }
+                    }
+                }, getTaskExecutor().getExecutor()
+                                      );
+
+        return returnVal;
     }
 
     @Override