summaryrefslogtreecommitdiff
path: root/qpid/java/client
diff options
context:
space:
mode:
authorArnaud Simon <arnaudsimon@apache.org>2007-10-26 15:07:20 +0000
committerArnaud Simon <arnaudsimon@apache.org>2007-10-26 15:07:20 +0000
commit8e69afab9139af7da0f3010e5a5a5548c15cfc0a (patch)
treee19c255e6e09d570fff2e9104167efc99f7b18f8 /qpid/java/client
parent58c9477dacefec4ba522aa81c76497710196e274 (diff)
downloadqpid-python-8e69afab9139af7da0f3010e5a5a5548c15cfc0a.tar.gz
Changed queue browsing behavior: added timeout for receiveing next message and set acquire mode to false
git-svn-id: https://svn.apache.org/repos/asf/incubator/qpid/trunk@588678 13f79535-47bb-0310-9956-ffa450edef68
Diffstat (limited to 'qpid/java/client')
-rw-r--r--qpid/java/client/src/main/java/org/apache/qpid/client/AMQQueueBrowser.java2
-rw-r--r--qpid/java/client/src/main/java/org/apache/qpid/client/AMQSession_0_10.java2
2 files changed, 2 insertions, 2 deletions
diff --git a/qpid/java/client/src/main/java/org/apache/qpid/client/AMQQueueBrowser.java b/qpid/java/client/src/main/java/org/apache/qpid/client/AMQQueueBrowser.java
index 28e5992b26..fc6ebad1c0 100644
--- a/qpid/java/client/src/main/java/org/apache/qpid/client/AMQQueueBrowser.java
+++ b/qpid/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/qpid/java/client/src/main/java/org/apache/qpid/client/AMQSession_0_10.java b/qpid/java/client/src/main/java/org/apache/qpid/client/AMQSession_0_10.java
index 8af3b106e3..e49bfddcc2 100644
--- a/qpid/java/client/src/main/java/org/apache/qpid/client/AMQSession_0_10.java
+++ b/qpid/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)
{