mirror of
https://github.com/XRPLF/rippled.git
synced 2025-11-22 12:05:53 +00:00
Compare commits
2 Commits
ximinez/em
...
develop
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
8449c6c365 | ||
|
|
58e03190ac |
@@ -171,7 +171,7 @@ getRowsMinMax(soci::session& session, TableType type)
|
||||
bool
|
||||
saveValidatedLedger(
|
||||
DatabaseCon& ldgDB,
|
||||
DatabaseCon& txnDB,
|
||||
std::unique_ptr<DatabaseCon> const& txnDB,
|
||||
Application& app,
|
||||
std::shared_ptr<Ledger const> const& ledger,
|
||||
bool current)
|
||||
@@ -254,7 +254,15 @@ saveValidatedLedger(
|
||||
|
||||
if (app.config().useTxTables())
|
||||
{
|
||||
auto db = txnDB.checkoutDb();
|
||||
if (!txnDB)
|
||||
{
|
||||
// LCOV_EXCL_START
|
||||
JLOG(j.fatal()) << "TxTables db isn't available";
|
||||
Throw<std::runtime_error>("TxTables db isn't available");
|
||||
// LCOV_EXCL_STOP
|
||||
}
|
||||
|
||||
auto db = txnDB->checkoutDb();
|
||||
|
||||
soci::transaction tr(*db);
|
||||
|
||||
|
||||
@@ -111,7 +111,7 @@ getRowsMinMax(soci::session& session, TableType type);
|
||||
bool
|
||||
saveValidatedLedger(
|
||||
DatabaseCon& ldgDB,
|
||||
DatabaseCon& txnDB,
|
||||
std::unique_ptr<DatabaseCon> const& txnDB,
|
||||
Application& app,
|
||||
std::shared_ptr<Ledger const> const& ledger,
|
||||
bool current);
|
||||
|
||||
@@ -392,8 +392,7 @@ SQLiteDatabaseImp::saveValidatedLedger(
|
||||
{
|
||||
if (existsLedger())
|
||||
{
|
||||
if (!detail::saveValidatedLedger(
|
||||
*lgrdb_, *txdb_, app_, ledger, current))
|
||||
if (!detail::saveValidatedLedger(*lgrdb_, txdb_, app_, ledger, current))
|
||||
return false;
|
||||
}
|
||||
|
||||
|
||||
@@ -121,6 +121,8 @@ VaultWithdraw::preclaim(PreclaimContext const& ctx)
|
||||
if (auto const ret = checkFrozen(ctx.view, dstAcct, vaultAsset))
|
||||
return ret;
|
||||
|
||||
// Cannot return shares to the vault, if the underlying asset was frozen for
|
||||
// the submitter
|
||||
if (auto const ret = checkFrozen(ctx.view, account, vaultShare))
|
||||
return ret;
|
||||
|
||||
|
||||
Reference in New Issue
Block a user