From 7d8624d0e759bf4db031463f7666419ba0a7ae9f Mon Sep 17 00:00:00 2001
From: JoelKatz <DavidJoelSchwartz@GMail.com>
Date: Mon, 11 Feb 2013 23:30:35 -0800
Subject: [PATCH] Fix two minor bugs with reporting load fees.

---
 src/cpp/ripple/LoadManager.cpp | 4 ++--
 src/cpp/ripple/NetworkOPs.cpp  | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/cpp/ripple/LoadManager.cpp b/src/cpp/ripple/LoadManager.cpp
index d596ddcf6..1a03a92bd 100644
--- a/src/cpp/ripple/LoadManager.cpp
+++ b/src/cpp/ripple/LoadManager.cpp
@@ -247,8 +247,8 @@ bool LoadFeeTrack::raiseLocalFee()
 	boost::mutex::scoped_lock sl(mLock);
 	uint32 origFee = mLocalTxnLoadFee;
 
-	if (mLocalTxnLoadFee < mLocalTxnLoadFee) // make sure this fee takes effect
-		mLocalTxnLoadFee = mLocalTxnLoadFee;
+	if (mLocalTxnLoadFee < mRemoteTxnLoadFee) // make sure this fee takes effect
+		mLocalTxnLoadFee = mRemoteTxnLoadFee;
 
 	mLocalTxnLoadFee += (mLocalTxnLoadFee / lftFeeIncFraction); // increment by 1/16th
 
diff --git a/src/cpp/ripple/NetworkOPs.cpp b/src/cpp/ripple/NetworkOPs.cpp
index 4940215d9..a97bb08f2 100644
--- a/src/cpp/ripple/NetworkOPs.cpp
+++ b/src/cpp/ripple/NetworkOPs.cpp
@@ -1163,7 +1163,7 @@ Json::Value NetworkOPs::getServerInfo(bool human, bool admin)
 	}
 	else
 		info["load_factor"] =
-			static_cast<double>(theApp->getFeeTrack().getLoadBase()) / theApp->getFeeTrack().getLoadFactor();
+			static_cast<double>(theApp->getFeeTrack().getLoadFactor()) / theApp->getFeeTrack().getLoadBase();
 
 	bool valid = false;
 	Ledger::pointer lpClosed	= getValidatedLedger();