svn commit: r594155 - /incubator/qpid/trunk/qpid/cpp/src/qpid/broker/SemanticState.cpp

[cctrieloff]

Author: cctrieloff
Date: Mon Nov 12 06:13:52 2007
New Revision: 594155

URL: http://svn.apache.org/viewvc?rev=594155&view=rev
Log:

- fix for dequeue window mode, no ack. (needs to record and dequeue)


Modified:
    incubator/qpid/trunk/qpid/cpp/src/qpid/broker/SemanticState.cpp

Modified: incubator/qpid/trunk/qpid/cpp/src/qpid/broker/SemanticState.cpp
URL: 
http://svn.apache.org/viewvc/incubator/qpid/trunk/qpid/cpp/src/qpid/broker/SemanticState.cpp?rev=594155&r1=594154&r2=594155&view=diff
==============================================================================
--- incubator/qpid/trunk/qpid/cpp/src/qpid/broker/SemanticState.cpp (original)
+++ incubator/qpid/trunk/qpid/cpp/src/qpid/broker/SemanticState.cpp Mon Nov 12 
06:13:52 2007
@@ -261,6 +261,7 @@
 
 bool SemanticState::ConsumerImpl::deliver(QueuedMessage& msg)
 {
+std::cout << " SemanticState::ConsumerImpl::deliver()" << windowing << "- " << 
ackExpected << std:: endl <<std::flush;
     if (!parent->getSession().isAttached()) {
         return false;
     }
@@ -273,14 +274,14 @@
             blocked = true;
         } else {
             blocked = false;
-
             Mutex::ScopedLock locker(parent->deliveryLock);
 
             DeliveryId deliveryTag =
                 parent->deliveryAdapter.deliver(msg, token);
             if (windowing || ackExpected) {
                 parent->record(DeliveryRecord(msg, queue, name, token, 
deliveryTag, acquire, !ackExpected));
-            } else if (acquire && !ackExpected) {
+            } 
+                       if (acquire && !ackExpected) {
                 queue->dequeue(0, msg.payload);
             }
         }