1 files changed, 4 insertions, 1 deletions
diff --git a/qpid/cpp/src/qpidd.cpp b/qpid/cpp/src/qpidd.cpp
index f170aed95e..2974cc8654 100644
--- a/qpid/cpp/src/qpidd.cpp
+++ b/qpid/cpp/src/qpidd.cpp
@@ -24,8 +24,11 @@
 using namespace qpid::broker;
 using namespace qpid::sys;
 
+Broker::shared_ptr broker;
+
 void handle_signal(int /*signal*/){
     std::cout << "Shutting down..." << std::endl;
+    broker->shutdown();
 }
 
 int main(int argc, char** argv)
@@ -36,8 +39,8 @@ int main(int argc, char** argv)
         if(config.isHelp()){
             config.usage();
         }else{
+            broker = Broker::create(config);
             apr_signal(SIGINT, handle_signal);
-            Broker::shared_ptr broker = Broker::create(config);
             broker->run();
         }
         return 0;