From b1aa893b59233a74f9259d2900fca615c142e1b5 Mon Sep 17 00:00:00 2001
From: JoelKatz <DavidJoelSchwartz@GMail.com>
Date: Mon, 17 Jun 2013 13:26:18 -0700
Subject: [PATCH] Don't send redundant fetch requests.

---
 src/cpp/ripple/ripple_LedgerAcquire.cpp | 9 +++++----
 src/cpp/ripple/ripple_LedgerAcquire.h   | 2 --
 2 files changed, 5 insertions(+), 6 deletions(-)

diff --git a/src/cpp/ripple/ripple_LedgerAcquire.cpp b/src/cpp/ripple/ripple_LedgerAcquire.cpp
index 125241154..9636895c9 100644
--- a/src/cpp/ripple/ripple_LedgerAcquire.cpp
+++ b/src/cpp/ripple/ripple_LedgerAcquire.cpp
@@ -284,8 +284,7 @@ void LedgerAcquire::trigger (Peer::ref peer)
 
     if ((mWaitCount > 0) && peer)
     {
-        mRecentPeers.push_back (peer->getPeerId ());
-        WriteLog (lsTRACE, LedgerAcquire) << "Deferring peer";
+        WriteLog (lsTRACE, LedgerAcquire) << "Skipping peer";
         return;
     }
 
@@ -396,6 +395,7 @@ void LedgerAcquire::trigger (Peer::ref peer)
             * (tmGL.add_nodeids ()) = SHAMapNode ().getRawString ();
             WriteLog (lsTRACE, LedgerAcquire) << "Sending TX root request to " << (peer ? "selected peer" : "all peers");
             sendRequest (tmGL, peer);
+            return;
         }
         else
         {
@@ -433,6 +433,7 @@ void LedgerAcquire::trigger (Peer::ref peer)
                     WriteLog (lsTRACE, LedgerAcquire) << "Sending TX node " << nodeIDs.size ()
                                                       << " request to " << (peer ? "selected peer" : "all peers");
                     sendRequest (tmGL, peer);
+                    return;
                 }
             }
         }
@@ -449,6 +450,7 @@ void LedgerAcquire::trigger (Peer::ref peer)
             * (tmGL.add_nodeids ()) = SHAMapNode ().getRawString ();
             WriteLog (lsTRACE, LedgerAcquire) << "Sending AS root request to " << (peer ? "selected peer" : "all peers");
             sendRequest (tmGL, peer);
+            return;
         }
         else
         {
@@ -485,13 +487,12 @@ void LedgerAcquire::trigger (Peer::ref peer)
                                                       << " request to " << (peer ? "selected peer" : "all peers");
                     CondLog (nodeIDs.size () == 1, lsTRACE, LedgerAcquire) << "AS node: " << nodeIDs[0];
                     sendRequest (tmGL, peer);
+                    return;
                 }
             }
         }
     }
 
-    mRecentPeers.clear ();
-
     if (mComplete || mFailed)
     {
         WriteLog (lsDEBUG, LedgerAcquire) << "Done:" << (mComplete ? " complete" : "") << (mFailed ? " failed " : " ")
diff --git a/src/cpp/ripple/ripple_LedgerAcquire.h b/src/cpp/ripple/ripple_LedgerAcquire.h
index 487e9a425..6c691bab8 100644
--- a/src/cpp/ripple/ripple_LedgerAcquire.h
+++ b/src/cpp/ripple/ripple_LedgerAcquire.h
@@ -109,8 +109,6 @@ private:
     std::set <SHAMapNode> mRecentTXNodes;
     std::set <SHAMapNode> mRecentASNodes;
 
-    std::vector <uint64> mRecentPeers;
-
     std::vector <FUNCTION_TYPE <void (LedgerAcquire::pointer)> > mOnComplete;
 };