diff --git a/websocket-sharp/Net/HttpListenerPrefixCollection.cs b/websocket-sharp/Net/HttpListenerPrefixCollection.cs index 15d79b66..7d6c457b 100644 --- a/websocket-sharp/Net/HttpListenerPrefixCollection.cs +++ b/websocket-sharp/Net/HttpListenerPrefixCollection.cs @@ -139,8 +139,8 @@ namespace WebSocketSharp.Net /// public void Add (string uriPrefix) { - ListenerPrefix.CheckUriPrefix (uriPrefix); _listener.CheckDisposed (); + ListenerPrefix.CheckUriPrefix (uriPrefix); if (_prefixes.Contains (uriPrefix)) return; @@ -184,10 +184,10 @@ namespace WebSocketSharp.Net /// public bool Contains (string uriPrefix) { + _listener.CheckDisposed (); if (uriPrefix == null) throw new ArgumentNullException ("uriPrefix"); - _listener.CheckDisposed (); return _prefixes.Contains (uriPrefix); } @@ -259,11 +259,10 @@ namespace WebSocketSharp.Net /// public bool Remove (string uriPrefix) { + _listener.CheckDisposed (); if (uriPrefix == null) throw new ArgumentNullException ("uriPrefix"); - _listener.CheckDisposed (); - var res = _prefixes.Remove (uriPrefix); if (res && _listener.IsListening) EndPointManager.RemovePrefix (uriPrefix, _listener);