QPID-2727: Handle exceptions in Broker constructor and call finalise to safely cleanup plugins

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

1 files changed, 5 insertions, 0 deletions

diff --git a/cpp/src/qpid/broker/Broker.cpp b/cpp/src/qpid/broker/Broker.cpp
index 4c2bd9c5bf..db3767bb59 100644
--- a/cpp/src/qpid/broker/Broker.cpp
+++ b/cpp/src/qpid/broker/Broker.cpp
@@ -165,6 +165,7 @@ Broker::Broker(const Broker::Options& conf) :
     getKnownBrokers(boost::bind(&Broker::getKnownBrokersImpl, this)),
     deferDelivery(boost::bind(&Broker::deferDeliveryImpl, this, _1, _2))
 {
+    try {
     if (conf.enableMgmt) {
         QPID_LOG(info, "Management enabled");
         managementAgent->configure(dataDir.isEnabled() ? dataDir.getPath() : string(),
@@ -289,6 +290,10 @@ Broker::Broker(const Broker::Options& conf) :
     } else if (conf.knownHosts != knownHostsNone) {
         knownBrokers.push_back(Url(conf.knownHosts));
     }
+    } catch (const std::exception& e) {
+        finalize();
+        throw;
+    }
 }
 
 void Broker::declareStandardExchange(const std::string& name, const std::string& type)