From fd86a3e67f96e4dc4ecf866b0854b0ef466c5a35 Mon Sep 17 00:00:00 2001
From: JoelKatz <DavidJoelSchwartz@GMail.com>
Date: Mon, 22 Jul 2013 13:34:37 -0700
Subject: [PATCH] Merge fix.

---
 src/cpp/ripple/ripple_TransactionAcquire.cpp | 11 +++--------
 1 file changed, 3 insertions(+), 8 deletions(-)

diff --git a/src/cpp/ripple/ripple_TransactionAcquire.cpp b/src/cpp/ripple/ripple_TransactionAcquire.cpp
index ac1accaa6..9202a5dc2 100644
--- a/src/cpp/ripple/ripple_TransactionAcquire.cpp
+++ b/src/cpp/ripple/ripple_TransactionAcquire.cpp
@@ -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();