diff options
| author | Gordon Sim <gsim@apache.org> | 2014-08-11 11:27:30 +0000 |
|---|---|---|
| committer | Gordon Sim <gsim@apache.org> | 2014-08-11 11:27:30 +0000 |
| commit | 6bed18c3cccaae9c5ef2e8f29aab473a3b44bfca (patch) | |
| tree | 14dc09f5e0893b9c62551c41cfedf1e2b5fb8eff | |
| parent | d5642bb6d16fc8d6dc8ef4d48c384b428812cc2e (diff) | |
| download | qpid-python-6bed18c3cccaae9c5ef2e8f29aab473a3b44bfca.tar.gz | |
QPID-5985: check for incoming messages - without waiting - even when timout is 0
git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk@1617256 13f79535-47bb-0310-9956-ffa450edef68
| -rw-r--r-- | qpid/cpp/src/qpid/client/amqp0_10/IncomingMessages.cpp | 2 | ||||
| -rw-r--r-- | qpid/cpp/src/tests/MessagingSessionTests.cpp | 25 |
2 files changed, 26 insertions, 1 deletions
diff --git a/qpid/cpp/src/qpid/client/amqp0_10/IncomingMessages.cpp b/qpid/cpp/src/qpid/client/amqp0_10/IncomingMessages.cpp index 5d8a77999e..4080efc340 100644 --- a/qpid/cpp/src/qpid/client/amqp0_10/IncomingMessages.cpp +++ b/qpid/cpp/src/qpid/client/amqp0_10/IncomingMessages.cpp @@ -175,7 +175,7 @@ bool IncomingMessages::getNextDestination(std::string& destination, qpid::sys::D { sys::Mutex::ScopedLock l(lock); AbsTime deadline(AbsTime::now(), timeout); - while (received.empty() && AbsTime::now() < deadline) { + while (received.empty()) { if (inUse) { //someone is already waiting on the sessions incoming queue lock.wait(deadline); diff --git a/qpid/cpp/src/tests/MessagingSessionTests.cpp b/qpid/cpp/src/tests/MessagingSessionTests.cpp index 95b985b5ae..0859bae619 100644 --- a/qpid/cpp/src/tests/MessagingSessionTests.cpp +++ b/qpid/cpp/src/tests/MessagingSessionTests.cpp @@ -1450,6 +1450,31 @@ QPID_AUTO_TEST_CASE(testSessionCheckError) } } +QPID_AUTO_TEST_CASE(testImmediateNextReceiver) +{ + QueueFixture fix; + Sender sender = fix.session.createSender(fix.queue); + Message out("test message"); + sender.send(out); + fix.session.createReceiver(fix.queue).setCapacity(1); + Receiver next; + qpid::sys::AbsTime start = qpid::sys::now(); + try { + while (!fix.session.nextReceiver(next, qpid::messaging::Duration::IMMEDIATE)) { + qpid::sys::Duration running(start, qpid::sys::now()); + if (running > 5*qpid::sys::TIME_SEC) { + throw qpid::types::Exception("Timed out spinning on nextReceiver(IMMEDIATE)"); + } + } + Message in; + BOOST_CHECK(next.fetch(in, qpid::messaging::Duration::IMMEDIATE)); + BOOST_CHECK_EQUAL(in.getContent(), out.getContent()); + next.close(); + } catch (const std::exception& e) { + BOOST_FAIL(e.what()); + } +} + QPID_AUTO_TEST_SUITE_END() }} // namespace qpid::tests |