From ba9b6da04d4006f34b587263b6e0f449b42595de Mon Sep 17 00:00:00 2001 From: "Carl C. Trieloff" Date: Fri, 17 Aug 2007 19:55:06 +0000 Subject: - few more clean-ups for async message store. git-svn-id: https://svn.apache.org/repos/asf/incubator/qpid/trunk/qpid@567119 13f79535-47bb-0310-9956-ffa450edef68 --- cpp/src/qpid/broker/BrokerQueue.cpp | 2 +- cpp/src/qpid/broker/RecoveredDequeue.cpp | 1 + cpp/src/qpid/broker/RecoveredEnqueue.cpp | 1 + 3 files changed, 3 insertions(+), 1 deletion(-) (limited to 'cpp/src') diff --git a/cpp/src/qpid/broker/BrokerQueue.cpp b/cpp/src/qpid/broker/BrokerQueue.cpp index ea092bb33b..5567131c19 100644 --- a/cpp/src/qpid/broker/BrokerQueue.cpp +++ b/cpp/src/qpid/broker/BrokerQueue.cpp @@ -103,9 +103,9 @@ void Queue::process(Message::shared_ptr& msg){ } void Queue::requeue(Message::shared_ptr& msg){ - { Mutex::ScopedLock locker(messageLock); + msg->enqueueComplete(); // mark the message as enqueued messages.push_front(msg); } serializer.execute(dispatchCallback); diff --git a/cpp/src/qpid/broker/RecoveredDequeue.cpp b/cpp/src/qpid/broker/RecoveredDequeue.cpp index 4551bf8761..b59a7f98c8 100644 --- a/cpp/src/qpid/broker/RecoveredDequeue.cpp +++ b/cpp/src/qpid/broker/RecoveredDequeue.cpp @@ -33,6 +33,7 @@ void RecoveredDequeue::commit() throw(){ } void RecoveredDequeue::rollback() throw(){ + msg->enqueueComplete(); queue->process(msg); } diff --git a/cpp/src/qpid/broker/RecoveredEnqueue.cpp b/cpp/src/qpid/broker/RecoveredEnqueue.cpp index 533af864b6..e5019affd8 100644 --- a/cpp/src/qpid/broker/RecoveredEnqueue.cpp +++ b/cpp/src/qpid/broker/RecoveredEnqueue.cpp @@ -30,6 +30,7 @@ bool RecoveredEnqueue::prepare(TransactionContext*) throw(){ } void RecoveredEnqueue::commit() throw(){ + msg->enqueueComplete(); queue->process(msg); } -- cgit v1.2.1