Author: astitcher
Date: Tue Apr 12 21:07:40 2011
New Revision: 1091571
URL: http://svn.apache.org/viewvc?rev=1091571&view=rev
Log:
QPID-3199: Locking error qpid::sys::StateMonitor
Modified:
qpid/branches/0.10/qpid/cpp/src/qpid/sys/StateMonitor.h
Modified: qpid/branches/0.10/qpid/cpp/src/qpid/sys/StateMonitor.h
URL:
http://svn.apache.org/viewvc/qpid/branches/0.10/qpid/cpp/src/qpid/sys/StateMonitor.h?rev=1091571&r1=1091570&r2=1091571&view=diff
==============================================================================
--- qpid/branches/0.10/qpid/cpp/src/qpid/sys/StateMonitor.h (original)
+++ qpid/branches/0.10/qpid/cpp/src/qpid/sys/StateMonitor.h Tue Apr 12 21:07:40
2011
@@ -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;
---------------------------------------------------------------------
Apache Qpid - AMQP Messaging Implementation
Project: http://qpid.apache.org
Use/Interact: mailto:commits-subscr...@qpid.apache.org
