svn commit: r1088539 - in /qpid/trunk/qpid/cpp/src/qpid/broker: RecoveredDequeue.cpp RecoveredEnqueue.cpp RecoveryManagerImpl.cpp TxPublish.cpp

[gsim]

Author: gsim
Date: Mon Apr  4 10:23:43 2011
New Revision: 1088539

URL: http://svn.apache.org/viewvc?rev=1088539&view=rev
Log:
QPID-3174: remove further unnecessary enqueueComplete() calls [enqueueAsync() 
only called when enqueing in a store, and is not required on recovery at all]

Modified:
    qpid/trunk/qpid/cpp/src/qpid/broker/RecoveredDequeue.cpp
    qpid/trunk/qpid/cpp/src/qpid/broker/RecoveredEnqueue.cpp
    qpid/trunk/qpid/cpp/src/qpid/broker/RecoveryManagerImpl.cpp
    qpid/trunk/qpid/cpp/src/qpid/broker/TxPublish.cpp

Modified: qpid/trunk/qpid/cpp/src/qpid/broker/RecoveredDequeue.cpp
URL: 
http://svn.apache.org/viewvc/qpid/trunk/qpid/cpp/src/qpid/broker/RecoveredDequeue.cpp?rev=1088539&r1=1088538&r2=1088539&view=diff
==============================================================================
--- qpid/trunk/qpid/cpp/src/qpid/broker/RecoveredDequeue.cpp (original)
+++ qpid/trunk/qpid/cpp/src/qpid/broker/RecoveredDequeue.cpp Mon Apr  4 
10:23:43 2011
@@ -43,7 +43,6 @@ void RecoveredDequeue::commit() throw()
 
 void RecoveredDequeue::rollback() throw()
 {
-    msg->enqueueComplete();
     queue->process(msg);
 }
 

Modified: qpid/trunk/qpid/cpp/src/qpid/broker/RecoveredEnqueue.cpp
URL: 
http://svn.apache.org/viewvc/qpid/trunk/qpid/cpp/src/qpid/broker/RecoveredEnqueue.cpp?rev=1088539&r1=1088538&r2=1088539&view=diff
==============================================================================
--- qpid/trunk/qpid/cpp/src/qpid/broker/RecoveredEnqueue.cpp (original)
+++ qpid/trunk/qpid/cpp/src/qpid/broker/RecoveredEnqueue.cpp Mon Apr  4 
10:23:43 2011
@@ -36,7 +36,6 @@ bool RecoveredEnqueue::prepare(Transacti
 }
 
 void RecoveredEnqueue::commit() throw(){
-    msg->enqueueComplete();
     queue->process(msg);
 }
 

Modified: qpid/trunk/qpid/cpp/src/qpid/broker/RecoveryManagerImpl.cpp
URL: 
http://svn.apache.org/viewvc/qpid/trunk/qpid/cpp/src/qpid/broker/RecoveryManagerImpl.cpp?rev=1088539&r1=1088538&r2=1088539&view=diff
==============================================================================
--- qpid/trunk/qpid/cpp/src/qpid/broker/RecoveryManagerImpl.cpp (original)
+++ qpid/trunk/qpid/cpp/src/qpid/broker/RecoveryManagerImpl.cpp Mon Apr  4 
10:23:43 2011
@@ -252,7 +252,6 @@ void RecoverableMessageImpl::dequeue(Dtx
 
 void RecoverableMessageImpl::enqueue(DtxBuffer::shared_ptr buffer, 
Queue::shared_ptr queue)
 {
-    msg->enqueueComplete(); // recoved nmessage to enqueued in store already
     buffer->enlist(TxOp::shared_ptr(new RecoveredEnqueue(queue, msg)));
 }
 

Modified: qpid/trunk/qpid/cpp/src/qpid/broker/TxPublish.cpp
URL: 
http://svn.apache.org/viewvc/qpid/trunk/qpid/cpp/src/qpid/broker/TxPublish.cpp?rev=1088539&r1=1088538&r2=1088539&view=diff
==============================================================================
--- qpid/trunk/qpid/cpp/src/qpid/broker/TxPublish.cpp (original)
+++ qpid/trunk/qpid/cpp/src/qpid/broker/TxPublish.cpp Mon Apr  4 10:23:43 2011
@@ -90,14 +90,7 @@ void TxPublish::deliverTo(const boost::s
 
 void TxPublish::prepare(TransactionContext* ctxt, const 
boost::shared_ptr<Queue> queue)
 {
-    if (!queue->enqueue(ctxt, msg)){
-        /**
-         * if not store then mark message for ack and deleivery once
-         * commit happens, as async IO will never set it when no store
-         * exists
-         */
-       msg->enqueueComplete();
-    }
+    queue->enqueue(ctxt, msg);
 }
 
 TxPublish::Commit::Commit(intrusive_ptr<Message>& _msg) : msg(_msg){}



---------------------------------------------------------------------
Apache Qpid - AMQP Messaging Implementation
Project:      http://qpid.apache.org
Use/Interact: mailto:commits-subscr...@qpid.apache.org