diff options
| author | Andrew Stitcher <astitcher@apache.org> | 2012-07-06 15:29:47 +0000 |
|---|---|---|
| committer | Andrew Stitcher <astitcher@apache.org> | 2012-07-06 15:29:47 +0000 |
| commit | 14fba4891b9947080f4a8520b2dc5577a8fad1e4 (patch) | |
| tree | 3da19bd2008bc5052e52f243c51589bc21aa8463 /cpp/src/qpid/sys/Timer.cpp | |
| parent | c3ceba2f0202c9db922dc48d50c6813e46ee15e3 (diff) | |
| download | qpid-python-14fba4891b9947080f4a8520b2dc5577a8fad1e4.tar.gz | |
NO-JIRA: Fix previous TimerTask fix to workaround stupid windows.h symbol corruption
git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk/qpid@1358265 13f79535-47bb-0310-9956-ffa450edef68
Diffstat (limited to 'cpp/src/qpid/sys/Timer.cpp')
| -rw-r--r-- | cpp/src/qpid/sys/Timer.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/cpp/src/qpid/sys/Timer.cpp b/cpp/src/qpid/sys/Timer.cpp index 0b3544e7b0..973c6bd8b7 100644 --- a/cpp/src/qpid/sys/Timer.cpp +++ b/cpp/src/qpid/sys/Timer.cpp @@ -55,7 +55,7 @@ bool TimerTask::readyToFire() const { bool TimerTask::prepareToFire() { Monitor::ScopedLock l(stateMonitor); if (state != CANCELLED) { - state = CALLBACK; + state = CALLING; return true; } else { return false; @@ -90,7 +90,7 @@ void TimerTask::restart() { void TimerTask::cancel() { Monitor::ScopedLock l(stateMonitor); - while (state == CALLBACK) { + while (state == CALLING) { stateMonitor.wait(); } state = CANCELLED; |