diff options
| author | Alan Conway <aconway@apache.org> | 2010-05-12 19:20:41 +0000 |
|---|---|---|
| committer | Alan Conway <aconway@apache.org> | 2010-05-12 19:20:41 +0000 |
| commit | 5f6ce80e6e223b203a35ec00c8d3f2a64e23c715 (patch) | |
| tree | 74df7a85d33a628a5bbe2e9d75b095e514a5e368 /cpp/src | |
| parent | 1d329b62c2dc4d8ccc41d5689f75389aa6a4fb6d (diff) | |
| download | qpid-python-5f6ce80e6e223b203a35ec00c8d3f2a64e23c715.tar.gz | |
Remove incorrect optimization in Logger.
Use of read-write lock causes a race in log.
git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk/qpid@943641 13f79535-47bb-0310-9956-ffa450edef68
Diffstat (limited to 'cpp/src')
| -rw-r--r-- | cpp/src/qpid/log/Logger.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/cpp/src/qpid/log/Logger.cpp b/cpp/src/qpid/log/Logger.cpp index 65b4568e74..939e2502cc 100644 --- a/cpp/src/qpid/log/Logger.cpp +++ b/cpp/src/qpid/log/Logger.cpp @@ -90,21 +90,21 @@ void Logger::log(const Statement& s, const std::string& msg) { os << msg << endl; std::string formatted=os.str(); { - sys::RWlock::ScopedRlock l(outputsLock); + ScopedLock l(lock); std::for_each(outputs.begin(), outputs.end(), boost::bind(&Output::log, _1, s, formatted)); } } void Logger::output(std::auto_ptr<Output> out) { - sys::RWlock::ScopedWlock l(outputsLock); + ScopedLock l(lock); outputs.push_back(out.release()); } void Logger::clear() { select(Selector()); // locked format(0); // locked - sys::RWlock::ScopedWlock l(outputsLock); + ScopedLock l(lock); outputs.clear(); } |
