From 5e1dddd1c7a8a41bfda708d38d7ef7418324bf2c Mon Sep 17 00:00:00 2001
From: JoelKatz <DavidJoelSchwartz@GMail.com>
Date: Fri, 17 May 2013 01:02:01 -0700
Subject: [PATCH] Second check if fetch pack should be skipped.

---
 src/cpp/ripple/LoadManager.cpp | 6 ++++++
 src/cpp/ripple/LoadManager.h   | 2 +-
 src/cpp/ripple/NetworkOPs.cpp  | 9 ++++++++-
 3 files changed, 15 insertions(+), 2 deletions(-)

diff --git a/src/cpp/ripple/LoadManager.cpp b/src/cpp/ripple/LoadManager.cpp
index 46965ff2b..3f5fb662c 100644
--- a/src/cpp/ripple/LoadManager.cpp
+++ b/src/cpp/ripple/LoadManager.cpp
@@ -285,6 +285,12 @@ bool LoadFeeTrack::raiseLocalFee()
 	return true;
 }
 
+bool LoadFeeTrack::isLoaded()
+{
+	boost::mutex::scoped_lock sl(mLock);
+	return (raiseCount != 0) || (mLocalTxnLoadFee != lftNormalFee);
+}
+
 bool LoadFeeTrack::lowerLocalFee()
 {
 	boost::mutex::scoped_lock sl(mLock);
diff --git a/src/cpp/ripple/LoadManager.h b/src/cpp/ripple/LoadManager.h
index 07722b9e6..4257b21af 100644
--- a/src/cpp/ripple/LoadManager.h
+++ b/src/cpp/ripple/LoadManager.h
@@ -185,7 +185,7 @@ public:
 	void setRemoteFee(uint32);
 	bool raiseLocalFee();
 	bool lowerLocalFee();
-	bool isLoaded()				{ return (raiseCount != 0) || (mLocalTxnLoadFee != lftNormalFee); }
+	bool isLoaded();
 };
 
 
diff --git a/src/cpp/ripple/NetworkOPs.cpp b/src/cpp/ripple/NetworkOPs.cpp
index 4b09dde55..f7734311e 100644
--- a/src/cpp/ripple/NetworkOPs.cpp
+++ b/src/cpp/ripple/NetworkOPs.cpp
@@ -2004,9 +2004,16 @@ void NetworkOPs::getBookPage(Ledger::pointer lpLedger, const uint160& uTakerPays
 //	jvResult["nodes"]	= Json::Value(Json::arrayValue);
 }
 
-void NetworkOPs::makeFetchPack(Job&, boost::weak_ptr<Peer> wPeer, boost::shared_ptr<ripple::TMGetObjectByHash> request,
+void NetworkOPs::makeFetchPack(Job&, boost::weak_ptr<Peer> wPeer,
+	boost::shared_ptr<ripple::TMGetObjectByHash> request,
 	Ledger::pointer wantLedger, Ledger::pointer haveLedger)
 {
+	if (theApp->getFeeTrack().isLoaded())
+	{
+		cLog(lsINFO) << "Too busy to make fetch pack";
+		return;
+	}
+
 	try
 	{
 		Peer::pointer peer = wPeer.lock();