Some dtx related updates.

git-svn-id: https://svn.apache.org/repos/asf/incubator/qpid/trunk/qpid@530500 13f79535-47bb-0310-9956-ffa450edef68

1 files changed, 17 insertions, 6 deletions

diff --git a/cpp/src/qpid/broker/TxBuffer.cpp b/cpp/src/qpid/broker/TxBuffer.cpp
index c526c88c25..5b5b00e929 100644
--- a/cpp/src/qpid/broker/TxBuffer.cpp
+++ b/cpp/src/qpid/broker/TxBuffer.cpp
@@ -24,17 +24,13 @@
 using boost::mem_fn;
 using namespace qpid::broker;
 
-bool TxBuffer::prepare(TransactionalStore* const store)
+bool TxBuffer::prepare(TransactionContext* const ctxt)
 {
-    std::auto_ptr<TransactionContext> ctxt;
-    if(store) ctxt = store->begin();
     for(op_iterator i = ops.begin(); i < ops.end(); i++){
-        if(!(*i)->prepare(ctxt.get())){
-            if(store) store->abort(*ctxt);
+        if(!(*i)->prepare(ctxt)){
             return false;
         }
     }
-    if(store) store->commit(*ctxt);
     return true;
 }
 
@@ -54,3 +50,18 @@ void TxBuffer::enlist(TxOp::shared_ptr op)
 {
     ops.push_back(op);
 }
+
+bool TxBuffer::commitLocal(TransactionalStore* const store)
+{
+    std::auto_ptr<TransactionContext> ctxt;
+    if(store) ctxt = store->begin();
+    if (prepare(ctxt.get())) {
+        if(store) store->commit(*ctxt);
+        commit();
+        return true;
+    } else {
+        if(store) store->abort(*ctxt);
+        rollback();
+        return false;
+    }
+}