diff options
| author | Alan Conway <aconway@apache.org> | 2010-07-07 15:20:01 +0000 |
|---|---|---|
| committer | Alan Conway <aconway@apache.org> | 2010-07-07 15:20:01 +0000 |
| commit | 592f0eb256d53307384e5379120cc202004c66d7 (patch) | |
| tree | 6351f56b343fbdd92782968608b198a1f39b1995 /qpid/cpp/src/posix/QpiddBroker.cpp | |
| parent | a0d9764eac4a0e6508d80951e2d4ce733c003f63 (diff) | |
| download | qpid-python-592f0eb256d53307384e5379120cc202004c66d7.tar.gz | |
Ensure broker is deleted in main thread, not by global destructors.
This fixes a race condition that was not handled by r959746.
git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk@961404 13f79535-47bb-0310-9956-ffa450edef68
Diffstat (limited to 'qpid/cpp/src/posix/QpiddBroker.cpp')
| -rw-r--r-- | qpid/cpp/src/posix/QpiddBroker.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/qpid/cpp/src/posix/QpiddBroker.cpp b/qpid/cpp/src/posix/QpiddBroker.cpp index bc45b27a2a..879935462e 100644 --- a/qpid/cpp/src/posix/QpiddBroker.cpp +++ b/qpid/cpp/src/posix/QpiddBroker.cpp @@ -113,7 +113,7 @@ void QpiddOptions::usage() const { // struct ScopedSetBroker { ScopedSetBroker(const boost::intrusive_ptr<Broker>& broker) { - qpid::broker::SignalHandler::setBroker(broker); + qpid::broker::SignalHandler::setBroker(broker.get()); } ~ScopedSetBroker() { qpid::broker::SignalHandler::setBroker(0); } }; |