You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@qpid.apache.org by ri...@apache.org on 2006/12/20 18:04:34 UTC

svn commit: r489140 - /incubator/qpid/trunk/qpid/java/client/src/main/java/org/apache/qpid/client/BasicMessageConsumer.java

Author: ritchiem
Date: Wed Dec 20 09:04:33 2006
New Revision: 489140

URL: http://svn.apache.org/viewvc?view=rev&rev=489140
Log:
QPID-225
Applied Patch for queue browsing with client acknowledgement

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

Modified: incubator/qpid/trunk/qpid/java/client/src/main/java/org/apache/qpid/client/BasicMessageConsumer.java
URL: http://svn.apache.org/viewvc/incubator/qpid/trunk/qpid/java/client/src/main/java/org/apache/qpid/client/BasicMessageConsumer.java?view=diff&rev=489140&r1=489139&r2=489140
==============================================================================
--- incubator/qpid/trunk/qpid/java/client/src/main/java/org/apache/qpid/client/BasicMessageConsumer.java (original)
+++ incubator/qpid/trunk/qpid/java/client/src/main/java/org/apache/qpid/client/BasicMessageConsumer.java Wed Dec 20 09:04:33 2006
@@ -554,6 +554,12 @@
     	msg.setJMSDestination(_destination);
         switch (_acknowledgeMode)
         {
+            case Session.CLIENT_ACKNOWLEDGE:
+                if (isNoConsume())
+                {
+                    _session.acknowledgeMessage(msg.getDeliveryTag(), false);
+                }
+                break;
             case Session.DUPS_OK_ACKNOWLEDGE:
                 if (++_outstanding >= _prefetchHigh)
                 {
@@ -580,7 +586,14 @@
                 }
                 break;
             case Session.SESSION_TRANSACTED:
-                _lastDeliveryTag = msg.getDeliveryTag();
+                if (isNoConsume())
+                {
+                    _session.acknowledgeMessage(msg.getDeliveryTag(), false);
+                }
+                else
+                {
+                    _lastDeliveryTag = msg.getDeliveryTag();
+                }
                 break;
         }
     }