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

Refactored a few for WebSocket.cs

Browse Source
This commit is contained in:
sta 2015-08-16 17:26:22 +09:00
parent 18776d1a22
commit b0048a213a
1 changed files with 19 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
websocket-sharp/WebSocket.cs
View File

@ -651,7 +651,7 @@ namespace WebSocketSharp
return !server && !_client return !server && !_client
? "This operation isn't available in the server." ? "This operation isn't available in the server."
: !connected && IsConnected : !connected && IsConnected
? "This operation isn't available after the connection has been established." ? "This operation isn't available in: " + _readyState
: null; : null;
} }
@ -722,8 +722,13 @@ namespace WebSocketSharp
private void close (CloseEventArgs e, bool send, bool wait) private void close (CloseEventArgs e, bool send, bool wait)
{ {
lock (_forConn) { lock (_forConn) {
if (_readyState == WebSocketState.Closing || _readyState == WebSocketState.Closed) { if (_readyState == WebSocketState.Closing) {
_logger.Info ("Closing the connection has already been done."); _logger.Info ("The closing is already in progress.");
return;
}
if (_readyState == WebSocketState.Closed) {
_logger.Info ("The connection has been closed.");
return; return;
} }
@ -1152,7 +1157,7 @@ namespace WebSocketSharp
{ {
lock (_forConn) { lock (_forConn) {
if (_readyState != WebSocketState.Open) { if (_readyState != WebSocketState.Open) {
_logger.Error ("Closing the connection has been done."); _logger.Error ("The sending has been interrupted.");
return false; return false;
} }
@ -1174,7 +1179,7 @@ namespace WebSocketSharp
sent = send (opcode, stream, compressed); sent = send (opcode, stream, compressed);
if (!sent) if (!sent)
error ("Sending the data has been interrupted.", null); error ("The sending has been interrupted.", null);
} }
catch (Exception ex) { catch (Exception ex) {
_logger.Fatal (ex.ToString ()); _logger.Fatal (ex.ToString ());
@ -1241,7 +1246,7 @@ namespace WebSocketSharp
{ {
lock (_forConn) { lock (_forConn) {
if (_readyState != WebSocketState.Open) { if (_readyState != WebSocketState.Open) {
_logger.Error ("Closing the connection has been done."); _logger.Error ("The sending has been interrupted.");
return false; return false;
} }
@ -1625,8 +1630,13 @@ namespace WebSocketSharp
internal void Close (CloseEventArgs e, byte[] frameAsBytes, TimeSpan timeout) internal void Close (CloseEventArgs e, byte[] frameAsBytes, TimeSpan timeout)
{ {
lock (_forConn) { lock (_forConn) {
if (_readyState == WebSocketState.Closing || _readyState == WebSocketState.Closed) { if (_readyState == WebSocketState.Closing) {
_logger.Info ("Closing the connection has already been done."); _logger.Info ("The closing is already in progress.");
return;
}
if (_readyState == WebSocketState.Closed) {
_logger.Info ("The connection has been closed.");
return; return;
} }
@ -1698,7 +1708,7 @@ namespace WebSocketSharp
lock (_forSend) { lock (_forSend) {
lock (_forConn) { lock (_forConn) {
if (_readyState != WebSocketState.Open) { if (_readyState != WebSocketState.Open) {
_logger.Error ("Closing the connection has been done."); _logger.Error ("The sending has been interrupted.");
return; return;
} }