Merge fix.

This commit is contained in:
JoelKatz
2013-07-22 13:34:37 -07:00
parent 69c16c19d6
commit fd86a3e67f

View File

@@ -61,14 +61,9 @@ void TransactionAcquire::onTimer (bool progress, boost::recursive_mutex::scoped_
if (getApp().getOPs ().stillNeedTXSet (mHash))
{
boost::recursive_mutex::scoped_lock sl (getApp().getMasterLock ());
if (getApp().getOPs ().stillNeedTXSet (mHash))
{
WriteLog (lsWARNING, TransactionAcquire) << "Still need it";
mTimeouts = 0;
aggressive = true;
}
WriteLog (lsWARNING, TransactionAcquire) << "Still need it";
mTimeouts = 0;
aggressive = true;
}
}
psl.lock();