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 | 7732decc05fd6bde9b758c1cb4a482b0391c1478 (patch) | |
| tree | 2167b53dfea6ed7bc1391b22764c6908f222e378 /cpp/src/posix | |
| parent | 4c678fc32b10d5cf63c3b39c5df32b7ee5933e95 (diff) | |
| download | qpid-python-7732decc05fd6bde9b758c1cb4a482b0391c1478.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/qpid@961404 13f79535-47bb-0310-9956-ffa450edef68
Diffstat (limited to 'cpp/src/posix')
| -rw-r--r-- | cpp/src/posix/QpiddBroker.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/cpp/src/posix/QpiddBroker.cpp b/cpp/src/posix/QpiddBroker.cpp index bc45b27a2a..879935462e 100644 --- a/cpp/src/posix/QpiddBroker.cpp +++ b/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); } }; |