From 60959023bcf268cb0e254786d35ad61e055b6bb9 Mon Sep 17 00:00:00 2001 From: Gordon Sim Date: Fri, 25 May 2007 15:22:51 +0000 Subject: Ensure work is marked completed when recovered. git-svn-id: https://svn.apache.org/repos/asf/incubator/qpid/trunk@541689 13f79535-47bb-0310-9956-ffa450edef68 --- qpid/cpp/src/qpid/broker/DtxManager.cpp | 8 -------- qpid/cpp/src/qpid/broker/DtxWorkRecord.cpp | 2 ++ 2 files changed, 2 insertions(+), 8 deletions(-) (limited to 'qpid/cpp/src') diff --git a/qpid/cpp/src/qpid/broker/DtxManager.cpp b/qpid/cpp/src/qpid/broker/DtxManager.cpp index 2af87a8751..d49cfbadfe 100644 --- a/qpid/cpp/src/qpid/broker/DtxManager.cpp +++ b/qpid/cpp/src/qpid/broker/DtxManager.cpp @@ -29,14 +29,6 @@ DtxManager::~DtxManager() {} 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); } diff --git a/qpid/cpp/src/qpid/broker/DtxWorkRecord.cpp b/qpid/cpp/src/qpid/broker/DtxWorkRecord.cpp index ff6e952517..0cfffb41a1 100644 --- a/qpid/cpp/src/qpid/broker/DtxWorkRecord.cpp +++ b/qpid/cpp/src/qpid/broker/DtxWorkRecord.cpp @@ -110,4 +110,6 @@ void DtxWorkRecord::recover(std::auto_ptr _txn, DtxBuffer { add(ops); txn = _txn; + ops->markEnded(); + completed = true; } -- cgit v1.2.1