From e5220a721c20647b528f45e0334310b3cc9d8a77 Mon Sep 17 00:00:00 2001
From: JoelKatz <DavidJoelSchwartz@GMail.com>
Date: Sat, 9 Feb 2013 20:36:55 -0800
Subject: [PATCH] Fix the fix.

---
 src/cpp/ripple/Ledger.cpp | 20 ++++----------------
 src/cpp/ripple/Ledger.h   |  2 +-
 2 files changed, 5 insertions(+), 17 deletions(-)

diff --git a/src/cpp/ripple/Ledger.cpp b/src/cpp/ripple/Ledger.cpp
index 5496f6fa4f..c259fb0a7c 100644
--- a/src/cpp/ripple/Ledger.cpp
+++ b/src/cpp/ripple/Ledger.cpp
@@ -548,7 +548,7 @@ Ledger::pointer Ledger::loadByHash(const uint256& ledgerHash)
 		assert(ledger->getHash() == ledgerHash);
 		Ledger::getSQL2(ledger);
 	}
-	return ret;
+	return ledger;
 }
 
 #else
@@ -661,24 +661,12 @@ Ledger::pointer Ledger::getSQL1(SqliteStatement *stmt)
 		closingTime, prevClosingTime, closeFlags, closeResolution, ledgerSeq);
 }
 
-void Ledger::getSQL2(Ledger::pointer ret)
+void Ledger::getSQL2(Ledger::ref ret)
 {
 	ret->setClosed();
-	if (theApp->getOPs().haveLedger(ledgerSeq))
+	if (theApp->getOPs().haveLedger(ret->getLedgerSeq()))
 		ret->setAccepted();
-	if (ret->getHash() != ledgerHash)
-	{
-		if (sLog(lsERROR))
-		{
-			Log(lsERROR) << "Failed on ledger";
-			Json::Value p;
-			ret->addJson(p, LEDGER_JSON_FULL);
-			Log(lsERROR) << p;
-		}
-		assert(false);
-	}
-	cLog(lsTRACE) << "Loaded ledger: " << ledgerHash;
-	return ret;
+	cLog(lsTRACE) << "Loaded ledger: " << ret->getHash().GetHex();
 }
 
 uint256 Ledger::getHashByIndex(uint32 ledgerIndex)
diff --git a/src/cpp/ripple/Ledger.h b/src/cpp/ripple/Ledger.h
index cb6fe241d9..587bfa1fb1 100644
--- a/src/cpp/ripple/Ledger.h
+++ b/src/cpp/ripple/Ledger.h
@@ -120,7 +120,7 @@ public:
 
 	static Ledger::pointer getSQL(const std::string& sqlStatement);
 	static Ledger::pointer getSQL1(SqliteStatement*);
-	static Ledger::pointer getSQL2(Ledger::ref);
+	static void getSQL2(Ledger::ref);
 	static Ledger::pointer getLastFullLedger();
 	static int getPendingSaves();