From c3c260680f18ccdd975a6008135233527c6ca76f Mon Sep 17 00:00:00 2001 From: Arnaud Simon Date: Mon, 2 Jun 2008 11:29:35 +0000 Subject: 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/qpid@662397 13f79535-47bb-0310-9956-ffa450edef68 --- java/client/src/main/java/org/apache/qpid/client/AMQSession_0_10.java | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) (limited to 'java') 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 e2767e2c9d..b9094db5bd 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 @@ -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, -- cgit v1.2.1