summaryrefslogtreecommitdiff
path: root/qpid/java
diff options
context:
space:
mode:
authorArnaud Simon <arnaudsimon@apache.org>2008-06-02 11:29:35 +0000
committerArnaud Simon <arnaudsimon@apache.org>2008-06-02 11:29:35 +0000
commit02d148e6a2b96549996d597e0eb2f940785100d3 (patch)
treefa54c821822c7c6f98fa342027dcf2bc651cd88c /qpid/java
parentb50a03b86a17efc3dba691fddec3b2dcb5c9f50b (diff)
downloadqpid-python-02d148e6a2b96549996d597e0eb2f940785100d3.tar.gz
QPID-1110: use pre-acquire mode when message selector is the empty string
git-svn-id: https://svn.apache.org/repos/asf/incubator/qpid/trunk@662397 13f79535-47bb-0310-9956-ffa450edef68
Diffstat (limited to 'qpid/java')
-rw-r--r--qpid/java/client/src/main/java/org/apache/qpid/client/AMQSession_0_10.java4
1 files changed, 3 insertions, 1 deletions
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 e2767e2c9d..b9094db5bd 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
@@ -377,7 +377,9 @@ public class AMQSession_0_10 extends AMQSession
boolean preAcquire;
try
{
- preAcquire = ( ! consumer.isNoConsume() && consumer.getMessageSelector() == null) || !(consumer.getDestination() instanceof AMQQueue);
+ preAcquire = ( ! consumer.isNoConsume() &&
+ (consumer.getMessageSelector() == null || consumer.getMessageSelector().equals("")) )
+ || !(consumer.getDestination() instanceof AMQQueue);
getQpidSession().messageSubscribe(queueName.toString(), tag.toString(),
getAcknowledgeMode() == NO_ACKNOWLEDGE ? Session.TRANSFER_CONFIRM_MODE_NOT_REQUIRED:Session.TRANSFER_CONFIRM_MODE_REQUIRED,
preAcquire ? Session.TRANSFER_ACQUIRE_MODE_PRE_ACQUIRE : Session.TRANSFER_ACQUIRE_MODE_NO_ACQUIRE,