diff options
Diffstat (limited to 'cpp/src/qpid/sys/BlockingQueue.h')
-rw-r--r-- | cpp/src/qpid/sys/BlockingQueue.h | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/cpp/src/qpid/sys/BlockingQueue.h b/cpp/src/qpid/sys/BlockingQueue.h index 4402c242e6..c6c6291b97 100644 --- a/cpp/src/qpid/sys/BlockingQueue.h +++ b/cpp/src/qpid/sys/BlockingQueue.h @@ -51,8 +51,12 @@ public: Mutex::ScopedLock l(waitable); { Waitable::ScopedWait w(waitable); - AbsTime deadline(now(),timeout); - while (queue.empty() && deadline > now()) waitable.wait(deadline); + if (timeout == TIME_INFINITE) { + while (queue.empty()) waitable.wait(); + } else { + AbsTime deadline(now(),timeout); + while (queue.empty() && deadline > now()) waitable.wait(deadline); + } } if (queue.empty()) return false; result = queue.front(); |