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

Added the internal Ext.CheckIfCanStart (ServerState) method

Browse Source
This commit is contained in:
sta 2015-08-12 17:24:53 +09:00
parent 7bd0fb87f2
commit 46eae139e2
3 changed files with 9 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
websocket-sharp/Ext.cs
View File

@ -238,6 +238,13 @@ namespace WebSocketSharp
: null; : null;
} }
internal static string CheckIfCanStart (this ServerState state)
{
return state == ServerState.Start || state == ServerState.ShuttingDown
? "This operation has already been done."
: null;
}
internal static string CheckIfStart (this ServerState state) internal static string CheckIfStart (this ServerState state)
{ {
return state == ServerState.Ready return state == ServerState.Ready

2
websocket-sharp/Server/HttpServer.cs
View File

@ -892,7 +892,7 @@ namespace WebSocketSharp.Server
public void Start () public void Start ()
{ {
lock (_sync) { lock (_sync) {
var msg = _state.CheckIfStartable () ?? checkIfCertificateExists (); var msg = _state.CheckIfCanStart () ?? checkIfCertificateExists ();
if (msg != null) { if (msg != null) {
_logger.Error (msg); _logger.Error (msg);
return; return;

2
websocket-sharp/Server/WebSocketServer.cs
View File

@ -795,7 +795,7 @@ namespace WebSocketSharp.Server
public void Start () public void Start ()
{ {
lock (_sync) { lock (_sync) {
var msg = _state.CheckIfStartable () ?? checkIfCertificateExists (); var msg = _state.CheckIfCanStart () ?? checkIfCertificateExists ();
if (msg != null) { if (msg != null) {
_logger.Error (msg); _logger.Error (msg);
return; return;