Reduce (ab)use of exceptions.

This commit is contained in:
JoelKatz
2013-06-11 16:55:23 -07:00
parent d604903804
commit dee5c70cd5
5 changed files with 74 additions and 83 deletions

View File

@@ -77,10 +77,9 @@ bool LedgerAcquire::tryLocal()
}
else
{
try
TransactionStateSF filter(mLedger->getLedgerSeq());
if (mLedger->peekTransactionMap()->fetchRoot(mLedger->getTransHash(), &filter))
{
TransactionStateSF filter(mLedger->getLedgerSeq());
mLedger->peekTransactionMap()->fetchRoot(mLedger->getTransHash(), &filter);
WriteLog (lsTRACE, LedgerAcquire) << "Got root txn map locally";
std::vector<uint256> h = mLedger->getNeededTransactionHashes(1, &filter);
if (h.empty())
@@ -89,9 +88,6 @@ bool LedgerAcquire::tryLocal()
mHaveTransactions = true;
}
}
catch (SHAMapMissingNode&)
{
}
}
}
@@ -104,10 +100,9 @@ bool LedgerAcquire::tryLocal()
}
else
{
try
AccountStateSF filter(mLedger->getLedgerSeq());
if (mLedger->peekAccountStateMap()->fetchRoot(mLedger->getAccountHash(), &filter))
{
AccountStateSF filter(mLedger->getLedgerSeq());
mLedger->peekAccountStateMap()->fetchRoot(mLedger->getAccountHash(), &filter);
WriteLog (lsTRACE, LedgerAcquire) << "Got root AS map locally";
std::vector<uint256> h = mLedger->getNeededAccountStateHashes(1, &filter);
if (h.empty())
@@ -116,9 +111,6 @@ bool LedgerAcquire::tryLocal()
mHaveState = true;
}
}
catch (SHAMapMissingNode&)
{
}
}
}