diff options
author | Andrew Stitcher <astitcher@apache.org> | 2011-04-11 21:47:07 +0000 |
---|---|---|
committer | Andrew Stitcher <astitcher@apache.org> | 2011-04-11 21:47:07 +0000 |
commit | 5d62bad99e3be0177ca684fffaddbd86698b3fe1 (patch) | |
tree | ebe3411ca8af59bd464730dae9de962e08f437b6 | |
parent | c0aa02908da2cd6d7aa91adcc4508d5a7cd511d9 (diff) | |
download | qpid-python-5d62bad99e3be0177ca684fffaddbd86698b3fe1.tar.gz |
QPID-3199: Locking error qpid::sys::StateMonitor
git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk@1091224 13f79535-47bb-0310-9956-ffa450edef68
-rw-r--r-- | qpid/cpp/src/qpid/sys/StateMonitor.h | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/qpid/cpp/src/qpid/sys/StateMonitor.h b/qpid/cpp/src/qpid/sys/StateMonitor.h index 5a92756f3a..b74195fb8d 100644 --- a/qpid/cpp/src/qpid/sys/StateMonitor.h +++ b/qpid/cpp/src/qpid/sys/StateMonitor.h @@ -60,13 +60,13 @@ class StateMonitor : public Waitable operator Enum() const { return state; } /** @pre Caller holds a ScopedLock */ - void waitFor(Enum s) { ScopedWait(*this); while (s != state) wait(); } + void waitFor(Enum s) { ScopedWait w(*this); while (s != state) wait(); } /** @pre Caller holds a ScopedLock */ - void waitFor(Set s) { ScopedWait(*this); while (!s.test(state)) wait(); } + void waitFor(Set s) { ScopedWait w(*this); while (!s.test(state)) wait(); } /** @pre Caller holds a ScopedLock */ - void waitNot(Enum s) { ScopedWait(*this); while (s == state) wait(); } + void waitNot(Enum s) { ScopedWait w(*this); while (s == state) wait(); } /** @pre Caller holds a ScopedLock */ - void waitNot(Set s) { ScopedWait(*this); while (s.test(state)) wait(); } + void waitNot(Set s) { ScopedWait w(*this); while (s.test(state)) wait(); } private: Enum state; |