From 6bed4cf29dda54560af44d16143fa4b24b65245b Mon Sep 17 00:00:00 2001
From: Alan Conway <aconway@apache.org>
Date: Tue, 5 Aug 2008 16:24:25 +0000
Subject: Fix sporadic shutdown hang in clustered broker. Add
 start|stop_cluster test scripts

git-svn-id: https://svn.apache.org/repos/asf/incubator/qpid/trunk/qpid@682774 13f79535-47bb-0310-9956-ffa450edef68
---
 cpp/src/qpid/broker/Broker.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'cpp/src/qpid/broker/Broker.cpp')

diff --git a/cpp/src/qpid/broker/Broker.cpp b/cpp/src/qpid/broker/Broker.cpp
index d876f6d253..a713a6c345 100644
--- a/cpp/src/qpid/broker/Broker.cpp
+++ b/cpp/src/qpid/broker/Broker.cpp
@@ -292,11 +292,11 @@ void Broker::shutdown() {
     // call any function that is not async-signal safe.
     // Any unsafe shutdown actions should be done in the destructor.
     poller->shutdown();
-    finalize();                 // Finalize any plugins.
 }
 
 Broker::~Broker() {
     shutdown();
+    finalize();                 // Finalize any plugins.
     delete store;    
     if (config.auth) {
 #if HAVE_SASL
-- 
cgit v1.2.1