DevWiki/websocket-sharp
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

[Modify] Polish it

Browse Source
This commit is contained in:
sta 2016-04-12 13:44:52 +09:00
parent 0d92f1205d
commit 82ea089683
1 changed files with 9 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
websocket-sharp/Net/HttpListener.cs
View File

@ -454,7 +454,10 @@ namespace WebSocketSharp.Net
private void close (bool force) private void close (bool force)
{ {
EndPointManager.RemoveListener (this); if (_listening) {
_listening = false;
EndPointManager.RemoveListener (this);
}
lock (_ctxRegistrySync) { lock (_ctxRegistrySync) {
if (!force) if (!force)
@ -464,6 +467,8 @@ namespace WebSocketSharp.Net
cleanupContextRegistry (); cleanupContextRegistry ();
cleanupConnections (); cleanupConnections ();
cleanupWaitQueue (new ObjectDisposedException (GetType ().ToString ())); cleanupWaitQueue (new ObjectDisposedException (GetType ().ToString ()));
_disposed = true;
} }
private HttpListenerContext getContextFromQueue () private HttpListenerContext getContextFromQueue ()
@ -648,12 +653,7 @@ namespace WebSocketSharp.Net
if (_disposed) if (_disposed)
return; return;
if (_listening) { close (true);
_listening = false;
close (true);
}
_disposed = true;
} }
/// <summary> /// <summary>
@ -701,12 +701,7 @@ namespace WebSocketSharp.Net
if (_disposed) if (_disposed)
return; return;
if (_listening) { close (false);
_listening = false;
close (false);
}
_disposed = true;
} }
/// <summary> /// <summary>
@ -836,12 +831,7 @@ namespace WebSocketSharp.Net
if (_disposed) if (_disposed)
return; return;
if (_listening) { close (true);
_listening = false;
close (true);
}
_disposed = true;
} }
#endregion #endregion