From 6ad03ee05ef89c6d7903b894d0b89ab9534d3686 Mon Sep 17 00:00:00 2001
From: JoelKatz <DavidJoelSchwartz@GMail.com>
Date: Tue, 5 Mar 2013 22:43:39 -0800
Subject: [PATCH] Better handle a "probably can't ever happen" condition.

---
 src/cpp/ripple/OrderBookDB.cpp | 39 ++++++++++++++++------------------
 1 file changed, 18 insertions(+), 21 deletions(-)

diff --git a/src/cpp/ripple/OrderBookDB.cpp b/src/cpp/ripple/OrderBookDB.cpp
index 61a1ef0c9..732b52904 100644
--- a/src/cpp/ripple/OrderBookDB.cpp
+++ b/src/cpp/ripple/OrderBookDB.cpp
@@ -39,35 +39,32 @@ void OrderBookDB::setup(Ledger::ref ledger)
 
 	while (currentIndex.isNonZero())
 	{
-		SLE::pointer entry=ledger->getSLEi(currentIndex);
-
-		OrderBook::pointer book = OrderBook::newOrderBook(entry);
-		if (book)
+		SLE::pointer entry = ledger->getSLEi(currentIndex);
+		if (entry)
 		{
-			cLog(lsTRACE) << "OrderBookDB: found book";
-
-			if (mKnownMap.find(book->getBookBase()) == mKnownMap.end())
+			OrderBook::pointer book = OrderBook::newOrderBook(entry);
+			if (book)
 			{
-				mKnownMap[book->getBookBase()] = true;
+				cLog(lsTRACE) << "OrderBookDB: found book";
 
-				cLog(lsTRACE) << "OrderBookDB: unknown book in: "
-					<< STAmount::createHumanCurrency(book->getCurrencyIn())
-					<< " -> "
-					<< STAmount::createHumanCurrency(book->getCurrencyOut());
+				if (mKnownMap.find(book->getBookBase()) == mKnownMap.end())
+				{
+					mKnownMap[book->getBookBase()] = true;
 
-				if (!book->getCurrencyIn())
-				{
-					// XRP
-					mXRPOrders.push_back(book);
-				}
-				else
-				{
-					mIssuerMap[book->getIssuerIn()].push_back(book);
+					cLog(lsTRACE) << "OrderBookDB: unknown book in: "
+						<< STAmount::createHumanCurrency(book->getCurrencyIn())
+						<< " -> "
+						<< STAmount::createHumanCurrency(book->getCurrencyOut());
+
+					if (!book->getCurrencyIn())			// XRP
+						mXRPOrders.push_back(book);
+					else
+						mIssuerMap[book->getIssuerIn()].push_back(book);
 				}
 			}
 		}
 
-		currentIndex=ledger->getNextLedgerIndex(currentIndex);
+		currentIndex = ledger->getNextLedgerIndex(currentIndex);
 	}
 
 	cLog(lsDEBUG) << "OrderBookDB<";