From ae8969529df128c06080c9c73c6ed62e0d2a9aa2 Mon Sep 17 00:00:00 2001
From: JoelKatz <DavidJoelSchwartz@GMail.com>
Date: Mon, 12 Aug 2013 20:17:52 -0700
Subject: [PATCH] Avoid deadlock.

---
 modules/ripple_app/ledger/LedgerMaster.cpp | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/modules/ripple_app/ledger/LedgerMaster.cpp b/modules/ripple_app/ledger/LedgerMaster.cpp
index a43761d958..2bc576ffc5 100644
--- a/modules/ripple_app/ledger/LedgerMaster.cpp
+++ b/modules/ripple_app/ledger/LedgerMaster.cpp
@@ -575,6 +575,7 @@ void LedgerMaster::advanceThread()
                 if ((missing != RangeSet::absent) &&
                     shouldAcquire(mValidLedger->getLedgerSeq(), getConfig().LEDGER_HISTORY, missing))
                 {
+                    sl.unlock();
                     Ledger::pointer nextLedger = mLedgerHistory.getLedgerBySeq(missing + 1);
                     if (nextLedger)
                     {
@@ -594,10 +595,8 @@ void LedgerMaster::advanceThread()
                         }
                         if (ledger)
                         {
-                            sl.unlock();
                             setFullLedger(ledger, false, false);
                             tryFill(ledger);
-                            sl.lock();
                             progress = true;
                         }
                     }
@@ -607,6 +606,9 @@ void LedgerMaster::advanceThread()
                         WriteLog (lsFATAL, LedgerMaster) << "Pub:" << mPubLedger->getLedgerSeq() << " Val:" << mValidLedger->getLedgerSeq();
                         assert(false);
                     }
+                    sl.lock();
+                    if (mValidLedger->getLedgerSeq() != mPubLedger->getLedgerSeq())
+                        progress = true;
                 }
             }
             else