Merge branch 'master' into ripple

This commit is contained in:
Arthur Britto
2012-08-01 14:34:24 -07:00
10 changed files with 135 additions and 45 deletions

View File

@@ -706,7 +706,10 @@ SLE::pointer TransactionEngine::entryCache(LedgerEntryType letType, const uint25
{
sleEntry = mLedger->getSLE(uIndex);
if (sleEntry)
{
mNodes.entryCache(sleEntry);
mOrigNodes.entryCache(sleEntry); // So the metadata code can compare to the original
}
}
else if(action == taaDELETE)
assert(false);
@@ -727,9 +730,9 @@ SLE::pointer TransactionEngine::entryCreate(LedgerEntryType letType, const uint2
}
void TransactionEngine::entryDelete(SLE::pointer sleEntry)
void TransactionEngine::entryDelete(SLE::pointer sleEntry, bool unfunded)
{
mNodes.entryDelete(sleEntry);
mNodes.entryDelete(sleEntry, unfunded);
}
void TransactionEngine::entryModify(SLE::pointer sleEntry)