From 1ddf8f39693d33f10fd891b43cfa3cfdd4d30b8f Mon Sep 17 00:00:00 2001
From: JoelKatz <DavidJoelSchwartz@GMail.com>
Date: Mon, 12 Aug 2013 12:01:55 -0700
Subject: [PATCH] Cleanups.

---
 modules/ripple_app/ledger/LedgerMaster.cpp    |  2 +-
 .../ledger/ripple_InboundLedger.cpp           | 21 ++++++-------------
 .../ripple_app/ledger/ripple_InboundLedger.h  |  2 +-
 .../ledger/ripple_InboundLedgers.cpp          |  7 +------
 4 files changed, 9 insertions(+), 23 deletions(-)

diff --git a/modules/ripple_app/ledger/LedgerMaster.cpp b/modules/ripple_app/ledger/LedgerMaster.cpp
index 4f371fdd53..07ee872a7c 100644
--- a/modules/ripple_app/ledger/LedgerMaster.cpp
+++ b/modules/ripple_app/ledger/LedgerMaster.cpp
@@ -393,7 +393,7 @@ void LedgerMaster::getFetchPack (Ledger::ref nextLedger)
         target->sendPacket (packet, false);
     }
     else
-        WriteLog (lsTRACE, LedgerMaster) << "No peer for fetch pack";
+        WriteLog (lsDEBUG, LedgerMaster) << "No peer for fetch pack";
 }
 
 bool LedgerMaster::shouldAcquire (uint32 currentLedger, uint32 ledgerHistory, uint32 candidateLedger)
diff --git a/modules/ripple_app/ledger/ripple_InboundLedger.cpp b/modules/ripple_app/ledger/ripple_InboundLedger.cpp
index 84affcc535..0aaf02194e 100644
--- a/modules/ripple_app/ledger/ripple_InboundLedger.cpp
+++ b/modules/ripple_app/ledger/ripple_InboundLedger.cpp
@@ -26,25 +26,16 @@ InboundLedger::InboundLedger (uint256 const& hash, uint32 seq)
 #ifdef LA_DEBUG
     WriteLog (lsTRACE, InboundLedger) << "Acquiring ledger " << mHash;
 #endif
-    tryLocal ();
+    if (tryLocal ())
+        done();
 }
 
-// Returns true if progress is made
-bool InboundLedger::checkLocal ()
+void InboundLedger::checkLocal ()
 {
-    bool ret = false;
+    boost::recursive_mutex::scoped_lock sl (mLock);
 
-    {
-        boost::recursive_mutex::scoped_lock sl (mLock);
-
-        if (!isDone () && tryLocal())
-        {
-            done();
-            ret = true;
-        }
-    }
-
-    return ret;
+    if (!isDone () && tryLocal())
+        done();
 }
 
 bool InboundLedger::tryLocal ()
diff --git a/modules/ripple_app/ledger/ripple_InboundLedger.h b/modules/ripple_app/ledger/ripple_InboundLedger.h
index 7bcdb67d82..9085fc1641 100644
--- a/modules/ripple_app/ledger/ripple_InboundLedger.h
+++ b/modules/ripple_app/ledger/ripple_InboundLedger.h
@@ -71,7 +71,7 @@ public:
     void addPeers ();
     void awaitData ();
     void noAwaitData ();
-    bool checkLocal ();
+    void checkLocal ();
 
     typedef std::pair <protocol::TMGetObjectByHash::ObjectType, uint256> neededHash_t;
 
diff --git a/modules/ripple_app/ledger/ripple_InboundLedgers.cpp b/modules/ripple_app/ledger/ripple_InboundLedgers.cpp
index 2fbb411857..43c87f3298 100644
--- a/modules/ripple_app/ledger/ripple_InboundLedgers.cpp
+++ b/modules/ripple_app/ledger/ripple_InboundLedgers.cpp
@@ -257,15 +257,10 @@ void InboundLedgers::gotFetchPack (Job&)
         acquires.push_back (it.second);
     }
 
-    bool progress = false;
     BOOST_FOREACH (const InboundLedger::pointer & acquire, acquires)
     {
-        if (acquire->checkLocal ())
-            progress = true;
+        acquire->checkLocal ();
     }
-
-    if (progress)
-        getApp().getLedgerMaster().tryAdvance();
 }
 
 void InboundLedgers::clearFailures ()