From 067f2cd4f9e00c6ebcbc62aff4fc06ea70d4c01c Mon Sep 17 00:00:00 2001
From: sta <sta.blockhead@gmail.com>
Date: Thu, 15 Oct 2020 20:03:14 +0900
Subject: [PATCH] [Modify] Move them

---
 websocket-sharp/Net/EndPointListener.cs |  4 +++-
 websocket-sharp/Net/EndPointManager.cs  | 10 +---------
 2 files changed, 4 insertions(+), 10 deletions(-)

diff --git a/websocket-sharp/Net/EndPointListener.cs b/websocket-sharp/Net/EndPointListener.cs
index 088057f9..8e8b2a96 100644
--- a/websocket-sharp/Net/EndPointListener.cs
+++ b/websocket-sharp/Net/EndPointListener.cs
@@ -222,7 +222,7 @@ namespace WebSocketSharp.Net
       if (prefs != null && prefs.Count > 0)
         return;
 
-      EndPointManager.RemoveEndPoint (_endpoint);
+      Close ();
     }
 
     private static void onAccept (IAsyncResult asyncResult)
@@ -484,6 +484,8 @@ namespace WebSocketSharp.Net
 
       for (var i = conns.Length - 1; i >= 0; i--)
         conns[i].Close (true);
+
+      EndPointManager.RemoveEndPoint (_endpoint);
     }
 
     public void RemovePrefix (HttpListenerPrefix prefix)
diff --git a/websocket-sharp/Net/EndPointManager.cs b/websocket-sharp/Net/EndPointManager.cs
index 37f34f9c..ac4582b2 100644
--- a/websocket-sharp/Net/EndPointManager.cs
+++ b/websocket-sharp/Net/EndPointManager.cs
@@ -208,16 +208,8 @@ namespace WebSocketSharp.Net
 
     internal static bool RemoveEndPoint (IPEndPoint endpoint)
     {
-      lock (((ICollection) _endpoints).SyncRoot) {
-        EndPointListener lsnr;
-
-        if (!_endpoints.TryGetValue (endpoint, out lsnr))
-          return false;
-
-        lsnr.Close ();
-
+      lock (((ICollection) _endpoints).SyncRoot)
         return _endpoints.Remove (endpoint);
-      }
     }
 
     #endregion