You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@qpid.apache.org by gs...@apache.org on 2014/08/11 13:27:31 UTC
svn commit: r1617256 - in /qpid/trunk/qpid/cpp/src:
qpid/client/amqp0_10/IncomingMessages.cpp tests/MessagingSessionTests.cpp
Author: gsim
Date: Mon Aug 11 11:27:30 2014
New Revision: 1617256
URL: http://svn.apache.org/r1617256
Log:
QPID-5985: check for incoming messages - without waiting - even when timout is 0
Modified:
qpid/trunk/qpid/cpp/src/qpid/client/amqp0_10/IncomingMessages.cpp
qpid/trunk/qpid/cpp/src/tests/MessagingSessionTests.cpp
Modified: qpid/trunk/qpid/cpp/src/qpid/client/amqp0_10/IncomingMessages.cpp
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/cpp/src/qpid/client/amqp0_10/IncomingMessages.cpp?rev=1617256&r1=1617255&r2=1617256&view=diff
==============================================================================
--- qpid/trunk/qpid/cpp/src/qpid/client/amqp0_10/IncomingMessages.cpp (original)
+++ qpid/trunk/qpid/cpp/src/qpid/client/amqp0_10/IncomingMessages.cpp Mon Aug 11 11:27:30 2014
@@ -175,7 +175,7 @@ bool IncomingMessages::getNextDestinatio
{
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);
Modified: qpid/trunk/qpid/cpp/src/tests/MessagingSessionTests.cpp
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/cpp/src/tests/MessagingSessionTests.cpp?rev=1617256&r1=1617255&r2=1617256&view=diff
==============================================================================
--- qpid/trunk/qpid/cpp/src/tests/MessagingSessionTests.cpp (original)
+++ qpid/trunk/qpid/cpp/src/tests/MessagingSessionTests.cpp Mon Aug 11 11:27:30 2014
@@ -1450,6 +1450,31 @@ QPID_AUTO_TEST_CASE(testSessionCheckErro
}
}
+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
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@qpid.apache.org
For additional commands, e-mail: commits-help@qpid.apache.org