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

Added the internal Ext.CheckIfCanSend (WebSocketState) method

Browse Source
This commit is contained in:
sta 2015-08-11 11:12:23 +09:00
parent dce49c037f
commit 7bd0fb87f2
2 changed files with 11 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
websocket-sharp/Ext.cs
View File

@ -231,15 +231,11 @@ namespace WebSocketSharp
: null; : null;
} }
internal static string CheckIfOpen (this WebSocketState state) internal static string CheckIfCanSend (this WebSocketState state)
{ {
return state == WebSocketState.Connecting return state != WebSocketState.Open
? "A WebSocket connection isn't established." ? String.Format ("This operation isn't available ({0}).", state)
: state == WebSocketState.Closing : null;
? "While closing the WebSocket connection."
: state == WebSocketState.Closed
? "The WebSocket connection has already been closed."
: null;
} }
internal static string CheckIfStart (this ServerState state) internal static string CheckIfStart (this ServerState state)

14
websocket-sharp/WebSocket.cs
View File

@ -2206,7 +2206,7 @@ namespace WebSocketSharp
/// </param> /// </param>
public void Send (byte[] data) public void Send (byte[] data)
{ {
var msg = _readyState.CheckIfOpen () ?? data.CheckIfValidSendData (); var msg = _readyState.CheckIfCanSend () ?? data.CheckIfValidSendData ();
if (msg != null) { if (msg != null) {
_logger.Error (msg); _logger.Error (msg);
error ("An error has occurred in sending the data.", null); error ("An error has occurred in sending the data.", null);
@ -2225,7 +2225,7 @@ namespace WebSocketSharp
/// </param> /// </param>
public void Send (FileInfo file) public void Send (FileInfo file)
{ {
var msg = _readyState.CheckIfOpen () ?? file.CheckIfValidSendData (); var msg = _readyState.CheckIfCanSend () ?? file.CheckIfValidSendData ();
if (msg != null) { if (msg != null) {
_logger.Error (msg); _logger.Error (msg);
error ("An error has occurred in sending the data.", null); error ("An error has occurred in sending the data.", null);
@ -2244,7 +2244,7 @@ namespace WebSocketSharp
/// </param> /// </param>
public void Send (string data) public void Send (string data)
{ {
var msg = _readyState.CheckIfOpen () ?? data.CheckIfValidSendData (); var msg = _readyState.CheckIfCanSend () ?? data.CheckIfValidSendData ();
if (msg != null) { if (msg != null) {
_logger.Error (msg); _logger.Error (msg);
error ("An error has occurred in sending the data.", null); error ("An error has occurred in sending the data.", null);
@ -2271,7 +2271,7 @@ namespace WebSocketSharp
/// </param> /// </param>
public void SendAsync (byte[] data, Action<bool> completed) public void SendAsync (byte[] data, Action<bool> completed)
{ {
var msg = _readyState.CheckIfOpen () ?? data.CheckIfValidSendData (); var msg = _readyState.CheckIfCanSend () ?? data.CheckIfValidSendData ();
if (msg != null) { if (msg != null) {
_logger.Error (msg); _logger.Error (msg);
error ("An error has occurred in sending the data.", null); error ("An error has occurred in sending the data.", null);
@ -2299,7 +2299,7 @@ namespace WebSocketSharp
/// </param> /// </param>
public void SendAsync (FileInfo file, Action<bool> completed) public void SendAsync (FileInfo file, Action<bool> completed)
{ {
var msg = _readyState.CheckIfOpen () ?? file.CheckIfValidSendData (); var msg = _readyState.CheckIfCanSend () ?? file.CheckIfValidSendData ();
if (msg != null) { if (msg != null) {
_logger.Error (msg); _logger.Error (msg);
error ("An error has occurred in sending the data.", null); error ("An error has occurred in sending the data.", null);
@ -2326,7 +2326,7 @@ namespace WebSocketSharp
/// </param> /// </param>
public void SendAsync (string data, Action<bool> completed) public void SendAsync (string data, Action<bool> completed)
{ {
var msg = _readyState.CheckIfOpen () ?? data.CheckIfValidSendData (); var msg = _readyState.CheckIfCanSend () ?? data.CheckIfValidSendData ();
if (msg != null) { if (msg != null) {
_logger.Error (msg); _logger.Error (msg);
error ("An error has occurred in sending the data.", null); error ("An error has occurred in sending the data.", null);
@ -2357,7 +2357,7 @@ namespace WebSocketSharp
/// </param> /// </param>
public void SendAsync (Stream stream, int length, Action<bool> completed) public void SendAsync (Stream stream, int length, Action<bool> completed)
{ {
var msg = _readyState.CheckIfOpen () ?? var msg = _readyState.CheckIfCanSend () ??
stream.CheckIfCanRead () ?? stream.CheckIfCanRead () ??
(length < 1 ? "'length' is less than 1." : null); (length < 1 ? "'length' is less than 1." : null);