From f8078da6c6617ce5359fa90feca93e191c6c014f Mon Sep 17 00:00:00 2001 From: Gordon Sim Date: Thu, 10 Jul 2008 08:39:10 +0000 Subject: Honour timeout in BlockingQueue::pop(); added test for SubscriptionManager::get() where no message exists. git-svn-id: https://svn.apache.org/repos/asf/incubator/qpid/trunk/qpid@675477 13f79535-47bb-0310-9956-ffa450edef68 --- cpp/src/qpid/sys/BlockingQueue.h | 2 +- cpp/src/tests/ClientSessionTest.cpp | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) (limited to 'cpp/src') diff --git a/cpp/src/qpid/sys/BlockingQueue.h b/cpp/src/qpid/sys/BlockingQueue.h index 9bb215ff7f..4402c242e6 100644 --- a/cpp/src/qpid/sys/BlockingQueue.h +++ b/cpp/src/qpid/sys/BlockingQueue.h @@ -52,7 +52,7 @@ public: { Waitable::ScopedWait w(waitable); AbsTime deadline(now(),timeout); - while (queue.empty()) waitable.wait(deadline); + while (queue.empty() && deadline > now()) waitable.wait(deadline); } if (queue.empty()) return false; result = queue.front(); diff --git a/cpp/src/tests/ClientSessionTest.cpp b/cpp/src/tests/ClientSessionTest.cpp index b55e4c231e..90616cf7f3 100644 --- a/cpp/src/tests/ClientSessionTest.cpp +++ b/cpp/src/tests/ClientSessionTest.cpp @@ -248,6 +248,7 @@ QPID_AUTO_TEST_CASE(testGet) { BOOST_CHECK_EQUAL("foo0", got.getData()); BOOST_CHECK(fix.subs.get(got, "getq", TIME_SEC)); BOOST_CHECK_EQUAL("foo1", got.getData()); + BOOST_CHECK(!fix.subs.get(got, "getq")); } QPID_AUTO_TEST_CASE(testOpenFailure) { -- cgit v1.2.1