From 93632ea079f380ca8d9b4ce90dff939b4772e01a Mon Sep 17 00:00:00 2001 From: "Carl C. Trieloff" Date: Mon, 12 Nov 2007 14:13:52 +0000 Subject: - fix for dequeue window mode, no ack. (needs to record and dequeue) git-svn-id: https://svn.apache.org/repos/asf/incubator/qpid/trunk/qpid@594155 13f79535-47bb-0310-9956-ffa450edef68 --- cpp/src/qpid/broker/SemanticState.cpp | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) (limited to 'cpp/src') diff --git a/cpp/src/qpid/broker/SemanticState.cpp b/cpp/src/qpid/broker/SemanticState.cpp index fa2ea38333..52975ea96e 100644 --- a/cpp/src/qpid/broker/SemanticState.cpp +++ b/cpp/src/qpid/broker/SemanticState.cpp @@ -261,6 +261,7 @@ SemanticState::ConsumerImpl::ConsumerImpl(SemanticState* _parent, bool SemanticState::ConsumerImpl::deliver(QueuedMessage& msg) { +std::cout << " SemanticState::ConsumerImpl::deliver()" << windowing << "- " << ackExpected << std:: endl <getSession().isAttached()) { return false; } @@ -273,14 +274,14 @@ bool SemanticState::ConsumerImpl::deliver(QueuedMessage& msg) 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); } } -- cgit v1.2.1