From 328fd5d43d1768256f7869fee3833419e8757ed5 Mon Sep 17 00:00:00 2001 From: sta Date: Tue, 24 Feb 2015 16:56:58 +0900 Subject: [PATCH] Replaced the RemoveEndPoint (IPEndPoint, EndPointListener) method with the RemoveEndPoint (EndPointListener) method --- websocket-sharp/Net/EndPointListener.cs | 2 +- websocket-sharp/Net/EndPointManager.cs | 9 +++++---- 2 files changed, 6 insertions(+), 5 deletions(-) diff --git a/websocket-sharp/Net/EndPointListener.cs b/websocket-sharp/Net/EndPointListener.cs index 56d5441d..17f7a5e4 100644 --- a/websocket-sharp/Net/EndPointListener.cs +++ b/websocket-sharp/Net/EndPointListener.cs @@ -176,7 +176,7 @@ namespace WebSocketSharp.Net if (_all != null && _all.Count > 0) return; - EndPointManager.RemoveEndPoint (_endpoint, this); + EndPointManager.RemoveEndPoint (this); } private static RSACryptoServiceProvider createRSAFromFile (string filename) diff --git a/websocket-sharp/Net/EndPointManager.cs b/websocket-sharp/Net/EndPointManager.cs index 1d60c8c7..f479e051 100644 --- a/websocket-sharp/Net/EndPointManager.cs +++ b/websocket-sharp/Net/EndPointManager.cs @@ -160,13 +160,14 @@ namespace WebSocketSharp.Net #region Internal Methods - internal static void RemoveEndPoint (IPEndPoint endpoint, EndPointListener endpointListener) + internal static void RemoveEndPoint (EndPointListener endpointListener) { lock (((ICollection) _ipToEndpoints).SyncRoot) { - var eps = _ipToEndpoints[endpoint.Address]; - eps.Remove (endpoint.Port); + var addr = endpointListener.Address; + var eps = _ipToEndpoints[addr]; + eps.Remove (endpointListener.Port); if (eps.Count == 0) - _ipToEndpoints.Remove (endpoint.Address); + _ipToEndpoints.Remove (addr); endpointListener.Close (); }