You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@qpid.apache.org by ro...@apache.org on 2015/06/10 18:51:47 UTC
qpid-jms git commit: QPIDJMS-71: ensure recieve(0) doesnt just fall
through, consolidate recieve() and recieve(timeout) as single implementation
Repository: qpid-jms
Updated Branches:
refs/heads/master ff0681fee -> 394946a6d
QPIDJMS-71: ensure recieve(0) doesnt just fall through, consolidate recieve() and recieve(timeout) as single implementation
Project: http://git-wip-us.apache.org/repos/asf/qpid-jms/repo
Commit: http://git-wip-us.apache.org/repos/asf/qpid-jms/commit/394946a6
Tree: http://git-wip-us.apache.org/repos/asf/qpid-jms/tree/394946a6
Diff: http://git-wip-us.apache.org/repos/asf/qpid-jms/diff/394946a6
Branch: refs/heads/master
Commit: 394946a6dfb16e7f4d79cb2152efaf7f4e38a82f
Parents: ff0681f
Author: Robert Gemmell <ro...@apache.org>
Authored: Wed Jun 10 17:29:47 2015 +0100
Committer: Robert Gemmell <ro...@apache.org>
Committed: Wed Jun 10 17:40:59 2015 +0100
----------------------------------------------------------------------
.../org/apache/qpid/jms/JmsMessageConsumer.java | 25 ++++++--------
.../integration/ConsumerIntegrationTest.java | 34 ++++++++++++++++++++
2 files changed, 43 insertions(+), 16 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/qpid-jms/blob/394946a6/qpid-jms-client/src/main/java/org/apache/qpid/jms/JmsMessageConsumer.java
----------------------------------------------------------------------
diff --git a/qpid-jms-client/src/main/java/org/apache/qpid/jms/JmsMessageConsumer.java b/qpid-jms-client/src/main/java/org/apache/qpid/jms/JmsMessageConsumer.java
index 7cc3ec6..dff2c83 100644
--- a/qpid-jms-client/src/main/java/org/apache/qpid/jms/JmsMessageConsumer.java
+++ b/qpid-jms-client/src/main/java/org/apache/qpid/jms/JmsMessageConsumer.java
@@ -202,15 +202,7 @@ public class JmsMessageConsumer implements MessageConsumer, JmsMessageAvailableC
*/
@Override
public Message receive() throws JMSException {
- checkClosed();
- checkMessageListener();
- sendPullCommand(0);
-
- try {
- return copy(ackFromReceive(this.messageQueue.dequeue(-1)));
- } catch (Exception e) {
- throw JmsExceptionSupport.create(e);
- }
+ return receive(0);
}
/**
@@ -225,15 +217,16 @@ public class JmsMessageConsumer implements MessageConsumer, JmsMessageAvailableC
checkMessageListener();
sendPullCommand(timeout);
- if (timeout > 0) {
- try {
- return copy(ackFromReceive(this.messageQueue.dequeue(timeout)));
- } catch (InterruptedException e) {
- throw JmsExceptionSupport.create(e);
- }
+ long wait = timeout;
+ if (timeout == 0) {
+ wait = -1;
}
- return null;
+ try {
+ return copy(ackFromReceive(this.messageQueue.dequeue(wait)));
+ } catch (InterruptedException e) {
+ throw JmsExceptionSupport.create(e);
+ }
}
/**
http://git-wip-us.apache.org/repos/asf/qpid-jms/blob/394946a6/qpid-jms-client/src/test/java/org/apache/qpid/jms/integration/ConsumerIntegrationTest.java
----------------------------------------------------------------------
diff --git a/qpid-jms-client/src/test/java/org/apache/qpid/jms/integration/ConsumerIntegrationTest.java b/qpid-jms-client/src/test/java/org/apache/qpid/jms/integration/ConsumerIntegrationTest.java
index d0ae2c0..2d0cbaf 100644
--- a/qpid-jms-client/src/test/java/org/apache/qpid/jms/integration/ConsumerIntegrationTest.java
+++ b/qpid-jms-client/src/test/java/org/apache/qpid/jms/integration/ConsumerIntegrationTest.java
@@ -18,10 +18,12 @@
*/
package org.apache.qpid.jms.integration;
+import static org.junit.Assert.assertNotNull;
import static org.junit.Assert.assertTrue;
import javax.jms.Connection;
import javax.jms.IllegalStateException;
+import javax.jms.Message;
import javax.jms.MessageConsumer;
import javax.jms.Queue;
import javax.jms.Session;
@@ -30,6 +32,8 @@ import org.apache.qpid.jms.test.QpidJmsTestCase;
import org.apache.qpid.jms.test.Wait;
import org.apache.qpid.jms.test.testpeer.TestAmqpPeer;
import org.apache.qpid.jms.test.testpeer.basictypes.AmqpError;
+import org.apache.qpid.jms.test.testpeer.describedtypes.sections.AmqpValueDescribedType;
+import org.apache.qpid.proton.amqp.DescribedType;
import org.junit.Test;
public class ConsumerIntegrationTest extends QpidJmsTestCase {
@@ -97,4 +101,34 @@ public class ConsumerIntegrationTest extends QpidJmsTestCase {
consumer.close();
}
}
+
+ /**
+ * Test that a message is received when calling recieve with a timeout
+ * of 0, which means wait indefinitely.
+ */
+ @Test(timeout = 5000)
+ public void testReceiveMessageWithRecieveZeroTimeout() throws Exception {
+ try (TestAmqpPeer testPeer = new TestAmqpPeer();) {
+ Connection connection = testFixture.establishConnecton(testPeer);
+ connection.start();
+
+ testPeer.expectBegin(true);
+
+ Session session = connection.createSession(false, Session.AUTO_ACKNOWLEDGE);
+ Queue queue = session.createQueue("myQueue");
+
+ DescribedType amqpValueNullContent = new AmqpValueDescribedType(null);
+
+ testPeer.expectReceiverAttach();
+ testPeer.expectLinkFlowRespondWithTransfer(null, null, null, null, amqpValueNullContent);
+ testPeer.expectDispositionThatIsAcceptedAndSettled();
+
+ MessageConsumer messageConsumer = session.createConsumer(queue);
+ Message receivedMessage = messageConsumer.receive(0);
+
+ assertNotNull("A message should have been recieved", receivedMessage);
+
+ testPeer.waitForAllHandlersToComplete(2000);
+ }
+ }
}
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@qpid.apache.org
For additional commands, e-mail: commits-help@qpid.apache.org