Merge fix.

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

View File

@@ -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)