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

OpenLedger::accept, flip order of modifier and locals:

Browse Source 
* And call in to the TxQ if enabled.
This commit is contained in:
Edward Hennis
2016-01-06 17:13:14 -05:00
parent 8da2a724fb
commit 6c5b23b317
1 changed files with 6 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
src/ripple/app/ledger/impl/OpenLedger.cpp
View File

@@ -19,6 +19,8 @@
#include <BeastConfig.h> #include <BeastConfig.h>
#include <ripple/app/ledger/OpenLedger.h> #include <ripple/app/ledger/OpenLedger.h>
#include <ripple/app/main/Application.h>
#include <ripple/app/misc/TxQ.h>
#include <ripple/app/tx/apply.h> #include <ripple/app/tx/apply.h>
#include <ripple/ledger/CachedView.h> #include <ripple/ledger/CachedView.h>
#include <ripple/protocol/Feature.h> #include <ripple/protocol/Feature.h>
@@ -108,13 +110,13 @@ OpenLedger::accept(Application& app, Rules const& rules,
return p.first; return p.first;
}), }),
retries, flags, j_); retries, flags, j_);
// Apply local tx
for (auto const& item : locals)
ripple::apply(app, *next,
*item.second, flags, j_);
// Call the modifier // Call the modifier
if (f) if (f)
f(*next, j_); f(*next, j_);
// Apply local tx
for (auto const& item : locals)
app.getTxQ().apply(app, *next,
item.second, flags, j_);
// Switch to the new open view // Switch to the new open view
std::lock_guard< std::lock_guard<
std::mutex> lock2(current_mutex_); std::mutex> lock2(current_mutex_);