mirror of
https://github.com/XRPLF/rippled.git
synced 2025-11-27 14:35:52 +00:00
Merge fix.
This commit is contained in:
@@ -61,14 +61,9 @@ void TransactionAcquire::onTimer (bool progress, boost::recursive_mutex::scoped_
|
|||||||
|
|
||||||
if (getApp().getOPs ().stillNeedTXSet (mHash))
|
if (getApp().getOPs ().stillNeedTXSet (mHash))
|
||||||
{
|
{
|
||||||
boost::recursive_mutex::scoped_lock sl (getApp().getMasterLock ());
|
WriteLog (lsWARNING, TransactionAcquire) << "Still need it";
|
||||||
|
mTimeouts = 0;
|
||||||
if (getApp().getOPs ().stillNeedTXSet (mHash))
|
aggressive = true;
|
||||||
{
|
|
||||||
WriteLog (lsWARNING, TransactionAcquire) << "Still need it";
|
|
||||||
mTimeouts = 0;
|
|
||||||
aggressive = true;
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
psl.lock();
|
psl.lock();
|
||||||
|
|||||||
Reference in New Issue
Block a user