You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@qpid.apache.org by cc...@apache.org on 2007/08/17 21:55:07 UTC
svn commit: r567119 - in /incubator/qpid/trunk/qpid/cpp/src/qpid/broker:
BrokerQueue.cpp RecoveredDequeue.cpp RecoveredEnqueue.cpp
Author: cctrieloff
Date: Fri Aug 17 12:55:06 2007
New Revision: 567119
URL: http://svn.apache.org/viewvc?view=rev&rev=567119
Log:
- few more clean-ups for async message store.
Modified:
incubator/qpid/trunk/qpid/cpp/src/qpid/broker/BrokerQueue.cpp
incubator/qpid/trunk/qpid/cpp/src/qpid/broker/RecoveredDequeue.cpp
incubator/qpid/trunk/qpid/cpp/src/qpid/broker/RecoveredEnqueue.cpp
Modified: incubator/qpid/trunk/qpid/cpp/src/qpid/broker/BrokerQueue.cpp
URL: http://svn.apache.org/viewvc/incubator/qpid/trunk/qpid/cpp/src/qpid/broker/BrokerQueue.cpp?view=diff&rev=567119&r1=567118&r2=567119
==============================================================================
--- incubator/qpid/trunk/qpid/cpp/src/qpid/broker/BrokerQueue.cpp (original)
+++ incubator/qpid/trunk/qpid/cpp/src/qpid/broker/BrokerQueue.cpp Fri Aug 17 12:55:06 2007
@@ -103,9 +103,9 @@
}
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);
Modified: incubator/qpid/trunk/qpid/cpp/src/qpid/broker/RecoveredDequeue.cpp
URL: http://svn.apache.org/viewvc/incubator/qpid/trunk/qpid/cpp/src/qpid/broker/RecoveredDequeue.cpp?view=diff&rev=567119&r1=567118&r2=567119
==============================================================================
--- incubator/qpid/trunk/qpid/cpp/src/qpid/broker/RecoveredDequeue.cpp (original)
+++ incubator/qpid/trunk/qpid/cpp/src/qpid/broker/RecoveredDequeue.cpp Fri Aug 17 12:55:06 2007
@@ -33,6 +33,7 @@
}
void RecoveredDequeue::rollback() throw(){
+ msg->enqueueComplete();
queue->process(msg);
}
Modified: incubator/qpid/trunk/qpid/cpp/src/qpid/broker/RecoveredEnqueue.cpp
URL: http://svn.apache.org/viewvc/incubator/qpid/trunk/qpid/cpp/src/qpid/broker/RecoveredEnqueue.cpp?view=diff&rev=567119&r1=567118&r2=567119
==============================================================================
--- incubator/qpid/trunk/qpid/cpp/src/qpid/broker/RecoveredEnqueue.cpp (original)
+++ incubator/qpid/trunk/qpid/cpp/src/qpid/broker/RecoveredEnqueue.cpp Fri Aug 17 12:55:06 2007
@@ -30,6 +30,7 @@
}
void RecoveredEnqueue::commit() throw(){
+ msg->enqueueComplete();
queue->process(msg);
}