You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@qpid.apache.org by ar...@apache.org on 2008/06/02 13:29:35 UTC

svn commit: r662397 - /incubator/qpid/trunk/qpid/java/client/src/main/java/org/apache/qpid/client/AMQSession_0_10.java

Author: arnaudsimon
Date: Mon Jun  2 04:29:35 2008
New Revision: 662397

URL: http://svn.apache.org/viewvc?rev=662397&view=rev
Log:
QPID-1110: use pre-acquire mode when message selector is the empty string

Modified:
    incubator/qpid/trunk/qpid/java/client/src/main/java/org/apache/qpid/client/AMQSession_0_10.java

Modified: incubator/qpid/trunk/qpid/java/client/src/main/java/org/apache/qpid/client/AMQSession_0_10.java
URL: http://svn.apache.org/viewvc/incubator/qpid/trunk/qpid/java/client/src/main/java/org/apache/qpid/client/AMQSession_0_10.java?rev=662397&r1=662396&r2=662397&view=diff
==============================================================================
--- incubator/qpid/trunk/qpid/java/client/src/main/java/org/apache/qpid/client/AMQSession_0_10.java (original)
+++ incubator/qpid/trunk/qpid/java/client/src/main/java/org/apache/qpid/client/AMQSession_0_10.java Mon Jun  2 04:29:35 2008
@@ -377,7 +377,9 @@
         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,