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

[Modify] Throw exception

Browse Source
This commit is contained in:
sta 2017-11-22 15:20:46 +09:00
parent 74f7c090f0
commit c00ffc8f7e
1 changed files with 59 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

76
websocket-sharp/WebSocket.cs
View File

@ -800,11 +800,37 @@ namespace WebSocketSharp
// As server // As server
private bool accept () private bool accept ()
{ {
if (_readyState == WebSocketState.Open) {
var msg = "The handshake request has already been accepted.";
_logger.Warn (msg);
return false;
}
lock (_forState) { lock (_forState) {
string msg; if (_readyState == WebSocketState.Open) {
if (!checkIfAvailable (true, false, false, false, out msg)) { var msg = "The handshake request has already been accepted.";
_logger.Warn (msg);
return false;
}
if (_readyState == WebSocketState.Closing) {
var msg = "The close process has set in.";
_logger.Error (msg); _logger.Error (msg);
error ("An error has occurred in accepting.", null);
msg = "An interruption has occurred while attempting to accept.";
error (msg, null);
return false;
}
if (_readyState == WebSocketState.Closed) {
var msg = "The connection has been closed.";
_logger.Error (msg);
msg = "An interruption has occurred while attempting to accept.";
error (msg, null);
return false; return false;
} }
@ -812,16 +838,18 @@ namespace WebSocketSharp
try { try {
if (!acceptHandshake ()) if (!acceptHandshake ())
return false; return false;
_readyState = WebSocketState.Open;
} }
catch (Exception ex) { catch (Exception ex) {
_logger.Fatal (ex.ToString ()); _logger.Fatal (ex.Message);
fatal ("An exception has occurred while accepting.", ex); _logger.Debug (ex.ToString ());
var msg = "An exception has occurred while attempting to accept.";
fatal (msg, ex);
return false; return false;
} }
_readyState = WebSocketState.Open;
return true; return true;
} }
} }
@ -2436,12 +2464,19 @@ namespace WebSocketSharp
/// </remarks> /// </remarks>
public void Accept () public void Accept ()
{ {
string msg; if (_client) {
if (!checkIfAvailable (false, true, true, false, false, false, out msg)) { var msg = "This instance is a client.";
_logger.Error (msg); throw new InvalidOperationException (msg);
error ("An error has occurred in accepting.", null); }
return; if (_readyState == WebSocketState.Closing) {
var msg = "The close process is in progress.";
throw new InvalidOperationException (msg);
}
if (_readyState == WebSocketState.Closed) {
var msg = "The connection has already been closed.";
throw new InvalidOperationException (msg);
} }
if (accept ()) if (accept ())
@ -2461,12 +2496,19 @@ namespace WebSocketSharp
/// </remarks> /// </remarks>
public void AcceptAsync () public void AcceptAsync ()
{ {
string msg; if (_client) {
if (!checkIfAvailable (false, true, true, false, false, false, out msg)) { var msg = "This instance is a client.";
_logger.Error (msg); throw new InvalidOperationException (msg);
error ("An error has occurred in accepting.", null); }
return; if (_readyState == WebSocketState.Closing) {
var msg = "The close process is in progress.";
throw new InvalidOperationException (msg);
}
if (_readyState == WebSocketState.Closed) {
var msg = "The connection has already been closed.";
throw new InvalidOperationException (msg);
} }
Func<bool> acceptor = accept; Func<bool> acceptor = accept;