summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--java/client/src/main/java/org/apache/qpid/client/AMQQueueBrowser.java2
-rw-r--r--java/client/src/main/java/org/apache/qpid/client/AMQSession_0_10.java2
2 files changed, 2 insertions, 2 deletions
diff --git a/java/client/src/main/java/org/apache/qpid/client/AMQQueueBrowser.java b/java/client/src/main/java/org/apache/qpid/client/AMQQueueBrowser.java
index 28e5992b26..fc6ebad1c0 100644
--- a/java/client/src/main/java/org/apache/qpid/client/AMQQueueBrowser.java
+++ b/java/client/src/main/java/org/apache/qpid/client/AMQQueueBrowser.java
@@ -109,7 +109,7 @@ public class AMQQueueBrowser implements QueueBrowser
{
_logger.info("QB:nextElement about to receive");
- _nextMessage = consumer.receive();
+ _nextMessage = consumer.receive(1000);
_logger.info("QB:nextElement received:" + _nextMessage);
}
catch (JMSException e)
diff --git a/java/client/src/main/java/org/apache/qpid/client/AMQSession_0_10.java b/java/client/src/main/java/org/apache/qpid/client/AMQSession_0_10.java
index 8af3b106e3..e49bfddcc2 100644
--- a/java/client/src/main/java/org/apache/qpid/client/AMQSession_0_10.java
+++ b/java/client/src/main/java/org/apache/qpid/client/AMQSession_0_10.java
@@ -343,7 +343,7 @@ public class AMQSession_0_10 extends AMQSession
boolean preAcquire;
try
{
- preAcquire = consumer.getMessageSelector() == null || !(consumer.getDestination() instanceof AMQQueue);
+ preAcquire = ( ! consumer.isNoConsume() && consumer.getMessageSelector() == null) || !(consumer.getDestination() instanceof AMQQueue);
}
catch (JMSException e)
{