From daabda5eff2a7e37a5669219d949f7ad646f6442 Mon Sep 17 00:00:00 2001 From: Kim van der Riet Date: Mon, 23 Dec 2013 16:57:56 +0000 Subject: QPID-5444: Recovering from qpid-txtest fails with "Inconsisntent TPL 2PC count" error message git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk/qpid@1553148 13f79535-47bb-0310-9956-ffa450edef68 --- cpp/src/qpid/linearstore/journal/RecoveryManager.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'cpp/src/qpid/linearstore/journal/RecoveryManager.cpp') diff --git a/cpp/src/qpid/linearstore/journal/RecoveryManager.cpp b/cpp/src/qpid/linearstore/journal/RecoveryManager.cpp index 16ca1e0994..6050d6e899 100644 --- a/cpp/src/qpid/linearstore/journal/RecoveryManager.cpp +++ b/cpp/src/qpid/linearstore/journal/RecoveryManager.cpp @@ -598,7 +598,7 @@ bool RecoveryManager::getNextRecordHeader() throw jexception(jerrno::JERR_RCVM_NULLXID, "ENQ", "RecoveryManager", "getNextRecordHeader"); } std::string xid((char*)xidp, er.xid_size()); - transactionMapRef_.insert_txn_data(xid, txn_data_t(h._rid, 0, start_fid, file_pos, true, false /*tpcFlag*/)); + transactionMapRef_.insert_txn_data(xid, txn_data_t(h._rid, 0, start_fid, file_pos, true, false, false)); if (transactionMapRef_.set_aio_compl(xid, h._rid) < txn_map::TMAP_OK) { // fail - xid or rid not found std::ostringstream oss; oss << std::hex << "_tmap.set_aio_compl: txn_enq xid=\"" << xid << "\" rid=0x" << h._rid; @@ -637,7 +637,7 @@ bool RecoveryManager::getNextRecordHeader() } std::string xid((char*)xidp, dr.xid_size()); transactionMapRef_.insert_txn_data(xid, txn_data_t(dr.rid(), dr.deq_rid(), start_fid, file_pos, - false, dr.is_txn_coml_commit())); + false, false, dr.is_txn_coml_commit())); if (transactionMapRef_.set_aio_compl(xid, dr.rid()) < txn_map::TMAP_OK) { // fail - xid or rid not found std::ostringstream oss; oss << std::hex << "_tmap.set_aio_compl: txn_deq xid=\"" << xid << "\" rid=0x" << dr.rid(); -- cgit v1.2.1