From b8c7e4ad5e57e080ad644ad919c2d2ee128bb3d0 Mon Sep 17 00:00:00 2001 From: Alan Conway Date: Thu, 1 Jul 2010 13:47:11 +0000 Subject: Ensure broker is deleted in main thread, not by global destructors. Fixes core dumps during shutdown. git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk/qpid@959661 13f79535-47bb-0310-9956-ffa450edef68 --- cpp/src/posix/QpiddBroker.cpp | 2 ++ 1 file changed, 2 insertions(+) (limited to 'cpp/src') diff --git a/cpp/src/posix/QpiddBroker.cpp b/cpp/src/posix/QpiddBroker.cpp index 7eef187ded..b340e3e52b 100644 --- a/cpp/src/posix/QpiddBroker.cpp +++ b/cpp/src/posix/QpiddBroker.cpp @@ -128,6 +128,7 @@ struct QpiddDaemon : public Daemon { uint16_t port=brokerPtr->getPort(options->daemon.transport); ready(port); // Notify parent. brokerPtr->run(); + broker::SignalHandler::setBroker(0); // Delete broker in this thread. } }; @@ -174,6 +175,7 @@ int QpiddBroker::execute (QpiddOptions *options) { if (options->broker.port == 0 || myOptions->daemon.transport != TCP) cout << uint16_t(brokerPtr->getPort(myOptions->daemon.transport)) << endl; brokerPtr->run(); + broker::SignalHandler::setBroker(0); // Delete broker in this thread. } return 0; } -- cgit v1.2.1