From f124a34730a742082fe365d1507a8332650bb586 Mon Sep 17 00:00:00 2001
From: Vinnie Falco <vinnie.falco@gmail.com>
Date: Tue, 1 Apr 2014 10:24:55 -0700
Subject: [PATCH] Fix assert invariant in Peers::close_all

---
 src/ripple_overlay/impl/Peers.cpp | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

diff --git a/src/ripple_overlay/impl/Peers.cpp b/src/ripple_overlay/impl/Peers.cpp
index 01e7f905e..f52215ab9 100644
--- a/src/ripple_overlay/impl/Peers.cpp
+++ b/src/ripple_overlay/impl/Peers.cpp
@@ -91,8 +91,6 @@ class PeersImp
 public:
     typedef std::unordered_map <PeerFinder::Slot::ptr,
         boost::weak_ptr <PeerImp>> PeersBySlot;
-    typedef std::unordered_map <beast::IP::Endpoint,
-        boost::weak_ptr <PeerImp>> PeersByIP;
 
     typedef boost::unordered_map <
         RippleAddress, Peer::pointer> PeerByPublicKey;
@@ -489,8 +487,12 @@ public:
         for (auto const& entry : m_peers)
         {
             PeerImp::ptr const peer (entry.second.lock());
-            assert (peer != nullptr);
-            peer->close (graceful);
+
+            // VFALCO The only case where the weak_ptr is expired should be if
+            //        ~PeerImp is pre-empted before it calls m_peers.remove()
+            //
+            if (peer != nullptr)
+                peer->close (graceful);
         }
     }