Modified TransactionalStore to return the txn ctxt as an auto_ptr to make ownership more obvious.

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

1 files changed, 12 insertions, 8 deletions

diff --git a/cpp/src/qpid/broker/TxBuffer.cpp b/cpp/src/qpid/broker/TxBuffer.cpp
index fe2ea8fbb1..920b9862b0 100644
--- a/cpp/src/qpid/broker/TxBuffer.cpp
+++ b/cpp/src/qpid/broker/TxBuffer.cpp
@@ -20,27 +20,31 @@
 using std::mem_fun;
 using namespace qpid::broker;
 
-bool TxBuffer::prepare(TransactionalStore* const store){
-    TransactionContext* ctxt(0);
+bool TxBuffer::prepare(TransactionalStore* const store)
+{
+    std::auto_ptr<TransactionContext> ctxt;
     if(store) ctxt = store->begin();
     for(op_iterator i = ops.begin(); i < ops.end(); i++){
-        if(!(*i)->prepare(ctxt)){
-            if(store) store->abort(ctxt);
+        if(!(*i)->prepare(ctxt.get())){
+            if(store) store->abort(ctxt.get());
             return false;
         }
     }
-    if(store) store->commit(ctxt);
+    if(store) store->commit(ctxt.get());
     return true;
 }
 
-void TxBuffer::commit(){
+void TxBuffer::commit()
+{
     for_each(ops.begin(), ops.end(), mem_fun(&TxOp::commit));
 }
 
-void TxBuffer::rollback(){
+void TxBuffer::rollback()
+{
     for_each(ops.begin(), ops.end(), mem_fun(&TxOp::rollback));
 }
 
-void TxBuffer::enlist(TxOp* const op){
+void TxBuffer::enlist(TxOp* const op)
+{
     ops.push_back(op);
 }