mirror of
https://github.com/XRPLF/rippled.git
synced 2025-11-20 19:15:54 +00:00
Merge fix.
This commit is contained in:
@@ -59,10 +59,6 @@ void TransactionAcquire::onTimer (bool progress, boost::recursive_mutex::scoped_
|
||||
{
|
||||
Application::ScopedLockType lock (getApp().getMasterLock (), __FILE__, __LINE__);
|
||||
|
||||
if (getApp().getOPs ().stillNeedTXSet (mHash))
|
||||
{
|
||||
boost::recursive_mutex::scoped_lock sl (getApp().getMasterLock ());
|
||||
|
||||
if (getApp().getOPs ().stillNeedTXSet (mHash))
|
||||
{
|
||||
WriteLog (lsWARNING, TransactionAcquire) << "Still need it";
|
||||
@@ -70,7 +66,6 @@ void TransactionAcquire::onTimer (bool progress, boost::recursive_mutex::scoped_
|
||||
aggressive = true;
|
||||
}
|
||||
}
|
||||
}
|
||||
psl.lock();
|
||||
|
||||
if (!aggressive)
|
||||
|
||||
Reference in New Issue
Block a user