From c975753f1e3a3bb3deb4d9897838c9b889ff4043 Mon Sep 17 00:00:00 2001
From: Olaoluwa Osuntokun <laolu32@gmail.com>
Date: Fri, 8 Jun 2018 20:36:41 -0700
Subject: [PATCH] server: remove pending conn request if we recv a outbound
 conn after a scheduled callback

In this commit, we ensure that if we're already ignoring a connection,
then we also ignore the pending persistent connection request.
Otherwise, we'll move to accept the replaced connection, but then
continue to attempt connection requests.
---
 server.go | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/server.go b/server.go
index fd13cb9e9..322e5011d 100644
--- a/server.go
+++ b/server.go
@@ -1727,6 +1727,11 @@ func (s *server) OutboundPeerConnected(connReq *connmgr.ConnReq, conn net.Conn)
 	// ignore this connection.
 	if _, ok := s.scheduledPeerConnection[pubStr]; ok {
 		srvrLog.Debugf("Ignoring connection, peer already scheduled")
+
+		if connReq != nil {
+			s.connMgr.Remove(connReq.ID())
+		}
+
 		conn.Close()
 		return
 	}