From 1a69b06670c9fca087d95064204256fb4a3f5f99 Mon Sep 17 00:00:00 2001
From: JoelKatz <DavidJoelSchwartz@GMail.com>
Date: Sun, 11 Aug 2013 17:18:57 -0700
Subject: [PATCH] bugfixes.

---
 modules/ripple_app/ledger/LedgerMaster.cpp | 30 ++++++++++++----------
 1 file changed, 16 insertions(+), 14 deletions(-)

diff --git a/modules/ripple_app/ledger/LedgerMaster.cpp b/modules/ripple_app/ledger/LedgerMaster.cpp
index e9ca0f4e9..9a271a35e 100644
--- a/modules/ripple_app/ledger/LedgerMaster.cpp
+++ b/modules/ripple_app/ledger/LedgerMaster.cpp
@@ -497,8 +497,10 @@ void LedgerMaster::checkAccept (uint256 const& hash, uint32 seq)
 
     if (!ledger)
     {
-        getApp().getInboundLedgers ().findCreate (hash, seq);
-        return;
+        InboundLedger::pointer i = getApp().getInboundLedgers ().findCreate (hash, seq);
+        if (!i->isDone() || !i->isComplete() || i->isFailed())
+            return;
+        ledger = i->getLedger();
     }
 
     if (ledger->getLedgerSeq() != seq)
@@ -529,7 +531,7 @@ void LedgerMaster::checkAccept (uint256 const& hash, uint32 seq)
 void LedgerMaster::advanceThread()
 {
     boost::recursive_mutex::scoped_lock sl (mLock);
-    assert (mValidLedger);
+    assert (mValidLedger && mAdvanceThread);
 
     bool progress;
 
@@ -562,7 +564,7 @@ void LedgerMaster::advanceThread()
                                 if (acq && acq->isComplete())
                                     ledger = acq->getLedger();
                             }
-                }
+                        }
                         if (ledger)
                         {
                             sl.unlock();
@@ -574,19 +576,19 @@ void LedgerMaster::advanceThread()
                     }
                 }
             }
-            else
+        }
+        else
+        {
+            BOOST_FOREACH(Ledger::ref ledger, pubLedgers)
             {
-                BOOST_FOREACH(Ledger::ref ledger, pubLedgers)
-                {
-                    sl.unlock();
+                sl.unlock();
 
-                    setFullLedger(ledger, true, true);
-                    getApp().getOPs().pubLedger(ledger);
+                setFullLedger(ledger, true, true);
+                getApp().getOPs().pubLedger(ledger);
 
-                    sl.lock();
-                    mPubLedger = ledger;
-                    progress = true;
-                }
+                sl.lock();
+                mPubLedger = ledger;
+                progress = true;
             }
         }
     } while (progress);