diff --git a/websocket-sharp/Ext.cs b/websocket-sharp/Ext.cs index 44735945..31737971 100644 --- a/websocket-sharp/Ext.cs +++ b/websocket-sharp/Ext.cs @@ -231,15 +231,11 @@ namespace WebSocketSharp : null; } - internal static string CheckIfOpen (this WebSocketState state) + internal static string CheckIfCanSend (this WebSocketState state) { - return state == WebSocketState.Connecting - ? "A WebSocket connection isn't established." - : state == WebSocketState.Closing - ? "While closing the WebSocket connection." - : state == WebSocketState.Closed - ? "The WebSocket connection has already been closed." - : null; + return state != WebSocketState.Open + ? String.Format ("This operation isn't available ({0}).", state) + : null; } internal static string CheckIfStart (this ServerState state) diff --git a/websocket-sharp/WebSocket.cs b/websocket-sharp/WebSocket.cs index 933a99ee..d874713c 100644 --- a/websocket-sharp/WebSocket.cs +++ b/websocket-sharp/WebSocket.cs @@ -2206,7 +2206,7 @@ namespace WebSocketSharp /// public void Send (byte[] data) { - var msg = _readyState.CheckIfOpen () ?? data.CheckIfValidSendData (); + var msg = _readyState.CheckIfCanSend () ?? data.CheckIfValidSendData (); if (msg != null) { _logger.Error (msg); error ("An error has occurred in sending the data.", null); @@ -2225,7 +2225,7 @@ namespace WebSocketSharp /// public void Send (FileInfo file) { - var msg = _readyState.CheckIfOpen () ?? file.CheckIfValidSendData (); + var msg = _readyState.CheckIfCanSend () ?? file.CheckIfValidSendData (); if (msg != null) { _logger.Error (msg); error ("An error has occurred in sending the data.", null); @@ -2244,7 +2244,7 @@ namespace WebSocketSharp /// public void Send (string data) { - var msg = _readyState.CheckIfOpen () ?? data.CheckIfValidSendData (); + var msg = _readyState.CheckIfCanSend () ?? data.CheckIfValidSendData (); if (msg != null) { _logger.Error (msg); error ("An error has occurred in sending the data.", null); @@ -2271,7 +2271,7 @@ namespace WebSocketSharp /// public void SendAsync (byte[] data, Action completed) { - var msg = _readyState.CheckIfOpen () ?? data.CheckIfValidSendData (); + var msg = _readyState.CheckIfCanSend () ?? data.CheckIfValidSendData (); if (msg != null) { _logger.Error (msg); error ("An error has occurred in sending the data.", null); @@ -2299,7 +2299,7 @@ namespace WebSocketSharp /// public void SendAsync (FileInfo file, Action completed) { - var msg = _readyState.CheckIfOpen () ?? file.CheckIfValidSendData (); + var msg = _readyState.CheckIfCanSend () ?? file.CheckIfValidSendData (); if (msg != null) { _logger.Error (msg); error ("An error has occurred in sending the data.", null); @@ -2326,7 +2326,7 @@ namespace WebSocketSharp /// public void SendAsync (string data, Action completed) { - var msg = _readyState.CheckIfOpen () ?? data.CheckIfValidSendData (); + var msg = _readyState.CheckIfCanSend () ?? data.CheckIfValidSendData (); if (msg != null) { _logger.Error (msg); error ("An error has occurred in sending the data.", null); @@ -2357,7 +2357,7 @@ namespace WebSocketSharp /// public void SendAsync (Stream stream, int length, Action completed) { - var msg = _readyState.CheckIfOpen () ?? + var msg = _readyState.CheckIfCanSend () ?? stream.CheckIfCanRead () ?? (length < 1 ? "'length' is less than 1." : null);