ARCHIVE/rippled
1
0
Fork 0
mirror of https://github.com/XRPLF/rippled.git synced 2025-11-24 04:55:52 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'develop' into feature-keyvadb

Browse Source 
Conflicts:
	src/cpp/ripple/ripple_TransactionAcquire.cpp
This commit is contained in:
JoelKatz
2013-07-22 13:32:10 -07:00
parent 64d45918eb 9cb06ba936
commit 69c16c19d6
15 changed files with 82 additions and 63 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
src/cpp/ripple/NetworkOPs.cpp
View File

@@ -1272,15 +1272,6 @@ NetworkOPs::getAccountTxs (const RippleAddress& account, int32 minLedger, int32
ledger->pendSave(false);
}
if (rawMeta.getLength() == 0)
{ // Work around a bug that could leave the metadata missing
uint32 seq = static_cast<uint32>(db->getBigInt("AccountTransactions.LedgerSeq"));
WriteLog(lsWARNING, NetworkOPs) << "Recovering ledger " << seq << ", txn " << txn->getID();
Ledger::pointer ledger = getLedgerBySeq(seq);
if (ledger)
ledger->pendSave(false);
}
TransactionMetaSet::pointer meta = boost::make_shared<TransactionMetaSet> (txn->getID (), txn->getLedger (), rawMeta.getData ());
ret.push_back (std::pair<Transaction::pointer, TransactionMetaSet::pointer> (txn, meta));
}