diff options
author | Gordon Sim <gsim@apache.org> | 2007-05-25 15:22:51 +0000 |
---|---|---|
committer | Gordon Sim <gsim@apache.org> | 2007-05-25 15:22:51 +0000 |
commit | 61efc2ec574caa88697a38c55b9dcc90ef7f28c4 (patch) | |
tree | fb86384cdfce409543e78703f7da9c0e4aba7425 /cpp | |
parent | 45f0ee18e3dacf9e8c746009eaef4e17b0a44bf8 (diff) | |
download | qpid-python-61efc2ec574caa88697a38c55b9dcc90ef7f28c4.tar.gz |
Ensure work is marked completed when recovered.
git-svn-id: https://svn.apache.org/repos/asf/incubator/qpid/trunk/qpid@541689 13f79535-47bb-0310-9956-ffa450edef68
Diffstat (limited to 'cpp')
-rw-r--r-- | cpp/src/qpid/broker/DtxManager.cpp | 8 | ||||
-rw-r--r-- | cpp/src/qpid/broker/DtxWorkRecord.cpp | 2 |
2 files changed, 2 insertions, 8 deletions
diff --git a/cpp/src/qpid/broker/DtxManager.cpp b/cpp/src/qpid/broker/DtxManager.cpp index 2af87a8751..d49cfbadfe 100644 --- a/cpp/src/qpid/broker/DtxManager.cpp +++ b/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/cpp/src/qpid/broker/DtxWorkRecord.cpp b/cpp/src/qpid/broker/DtxWorkRecord.cpp index ff6e952517..0cfffb41a1 100644 --- a/cpp/src/qpid/broker/DtxWorkRecord.cpp +++ b/cpp/src/qpid/broker/DtxWorkRecord.cpp @@ -110,4 +110,6 @@ void DtxWorkRecord::recover(std::auto_ptr<TPCTransactionContext> _txn, DtxBuffer { add(ops); txn = _txn; + ops->markEnded(); + completed = true; } |