ARCHIVE/rippled
1
0
Fork 0
mirror of https://github.com/XRPLF/rippled.git synced 2025-12-06 17:27:55 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'continuousClose'

Browse Source 
Conflicts:
	src/LedgerAcquire.cpp
	src/NetworkOPs.h

Merge continuous ledger close into main branch. YAY!
This commit is contained in:
JoelKatz
2012-07-16 14:48:21 -07:00
parent 060772ad7d 659bb5af63
commit e89af2f784
35 changed files with 750 additions and 546 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
src/LedgerNode.cpp
View File

@@ -29,8 +29,7 @@ LedgerStateParms Ledger::writeBack(LedgerStateParms parms, SLE::pointer entry)
if (create)
{
assert(!mAccountStateMap->hasItem(entry->getIndex()));
if (!mAccountStateMap->addGiveItem(item, false))
if(!mAccountStateMap->addGiveItem(item, false, false)) // FIXME: TX metadata
{
assert(false);
return lepERROR;
@@ -38,7 +37,7 @@ LedgerStateParms Ledger::writeBack(LedgerStateParms parms, SLE::pointer entry)
return lepCREATED;
}
if (!mAccountStateMap->updateGiveItem(item, false))
if (!mAccountStateMap->updateGiveItem(item, false, false)) // FIXME: TX metadata
{
assert(false);
return lepERROR;