1 files changed, 4 insertions, 1 deletions
diff --git a/cpp/src/qpid/broker/Broker.cpp b/cpp/src/qpid/broker/Broker.cpp
index 57ff7a550c..1d55db0c0f 100644
--- a/cpp/src/qpid/broker/Broker.cpp
+++ b/cpp/src/qpid/broker/Broker.cpp
@@ -212,13 +212,16 @@ void Broker::run() {
 }
 
 void Broker::shutdown() {
+    // NB: this function must be async-signal safe, it must not
+    // call any function that is not async-signal safe.
+    // Any unsafe shutdown actions should be done in the destructor.
     if (acceptor)
         acceptor->shutdown();
-    ManagementAgent::shutdown ();
 }
 
 Broker::~Broker() {
     shutdown();
+    ManagementAgent::shutdown ();
     delete store;    
 }