diff --git a/src/ripple/app/misc/NetworkOPs.cpp b/src/ripple/app/misc/NetworkOPs.cpp index afd793ebe..dd43af0dd 100644 --- a/src/ripple/app/misc/NetworkOPs.cpp +++ b/src/ripple/app/misc/NetworkOPs.cpp @@ -275,7 +275,7 @@ public: * * @param Lock that protects the transaction batching */ - void apply (std::unique_lock& lock); + void apply (std::unique_lock& batchLock); /** * Apply each transaction to open ledger. @@ -1089,7 +1089,7 @@ void NetworkOPsImp::transactionBatch() } } -void NetworkOPsImp::apply (std::unique_lock& lock) +void NetworkOPsImp::apply (std::unique_lock& batchLock) { std::vector transactions; mTransactions.swap (transactions); @@ -1098,7 +1098,7 @@ void NetworkOPsImp::apply (std::unique_lock& lock) assert (mDispatchState != DispatchState::running); mDispatchState = DispatchState::running; - lock.unlock(); + batchLock.unlock(); Ledger::pointer ledger; TransactionEngine engine; @@ -1203,7 +1203,7 @@ void NetworkOPsImp::apply (std::unique_lock& lock) } } - lock.lock(); + batchLock.lock(); for (TransactionStatus& e : transactions) e.transaction->clearApplying();