svn commit: r541689 - in /incubator/qpid/trunk/qpid/cpp/src/qpid/broker: DtxManager.cpp DtxWorkRecord.cpp

[gsim]

Author: gsim
Date: Fri May 25 08:22:51 2007
New Revision: 541689

URL: http://svn.apache.org/viewvc?view=rev&rev=541689
Log:
Ensure work is marked completed when recovered.


Modified:
    incubator/qpid/trunk/qpid/cpp/src/qpid/broker/DtxManager.cpp
    incubator/qpid/trunk/qpid/cpp/src/qpid/broker/DtxWorkRecord.cpp

Modified: incubator/qpid/trunk/qpid/cpp/src/qpid/broker/DtxManager.cpp
URL: 
http://svn.apache.org/viewvc/incubator/qpid/trunk/qpid/cpp/src/qpid/broker/DtxManager.cpp?view=diff&rev=541689&r1=541688&r2=541689
==============================================================================
--- incubator/qpid/trunk/qpid/cpp/src/qpid/broker/DtxManager.cpp (original)
+++ incubator/qpid/trunk/qpid/cpp/src/qpid/broker/DtxManager.cpp Fri May 25 
08:22:51 2007
@@ -29,14 +29,6 @@
 
 void DtxManager::start(std::string xid, DtxBuffer::shared_ptr ops)
 {
-    /*
-    WorkMap::iterator i = work.find(xid);
-    if (i == work.end()) {
-        i = work.insert(xid, new DtxWorkRecord(xid, store)).first;
-    }
-    i->add(ops);
-    */
-
     getOrCreateWork(xid)->add(ops);
 }
 

Modified: incubator/qpid/trunk/qpid/cpp/src/qpid/broker/DtxWorkRecord.cpp
URL: 
http://svn.apache.org/viewvc/incubator/qpid/trunk/qpid/cpp/src/qpid/broker/DtxWorkRecord.cpp?view=diff&rev=541689&r1=541688&r2=541689
==============================================================================
--- incubator/qpid/trunk/qpid/cpp/src/qpid/broker/DtxWorkRecord.cpp (original)
+++ incubator/qpid/trunk/qpid/cpp/src/qpid/broker/DtxWorkRecord.cpp Fri May 25 
08:22:51 2007
@@ -110,4 +110,6 @@
 {
     add(ops);
     txn = _txn;
+    ops->markEnded();
+    completed = true;
 }