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

Fix the fix.

Browse Source
This commit is contained in:
JoelKatz
2013-02-09 20:36:55 -08:00
parent 4843a90910
commit e5220a721c
2 changed files with 5 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
src/cpp/ripple/Ledger.cpp
View File

@@ -548,7 +548,7 @@ Ledger::pointer Ledger::loadByHash(const uint256& ledgerHash)
assert(ledger->getHash() == ledgerHash); assert(ledger->getHash() == ledgerHash);
Ledger::getSQL2(ledger); Ledger::getSQL2(ledger);
} }
return ret; return ledger;
} }
#else #else
@@ -661,24 +661,12 @@ Ledger::pointer Ledger::getSQL1(SqliteStatement *stmt)
closingTime, prevClosingTime, closeFlags, closeResolution, ledgerSeq); closingTime, prevClosingTime, closeFlags, closeResolution, ledgerSeq);
} }
void Ledger::getSQL2(Ledger::pointer ret) void Ledger::getSQL2(Ledger::ref ret)
{ {
ret->setClosed(); ret->setClosed();
if (theApp->getOPs().haveLedger(ledgerSeq)) if (theApp->getOPs().haveLedger(ret->getLedgerSeq()))
ret->setAccepted(); ret->setAccepted();
if (ret->getHash() != ledgerHash) cLog(lsTRACE) << "Loaded ledger: " << ret->getHash().GetHex();
{
if (sLog(lsERROR))
{
Log(lsERROR) << "Failed on ledger";
Json::Value p;
ret->addJson(p, LEDGER_JSON_FULL);
Log(lsERROR) << p;
}
assert(false);
}
cLog(lsTRACE) << "Loaded ledger: " << ledgerHash;
return ret;
} }
uint256 Ledger::getHashByIndex(uint32 ledgerIndex) uint256 Ledger::getHashByIndex(uint32 ledgerIndex)

2
src/cpp/ripple/Ledger.h
View File

@@ -120,7 +120,7 @@ public:
static Ledger::pointer getSQL(const std::string& sqlStatement); static Ledger::pointer getSQL(const std::string& sqlStatement);
static Ledger::pointer getSQL1(SqliteStatement*); static Ledger::pointer getSQL1(SqliteStatement*);
static Ledger::pointer getSQL2(Ledger::ref); static void getSQL2(Ledger::ref);
static Ledger::pointer getLastFullLedger(); static Ledger::pointer getLastFullLedger();
static int getPendingSaves(); static int getPendingSaves();