From e81c5b7d964834e9444af0a9663cd9a83e3ad6db Mon Sep 17 00:00:00 2001 From: sta Date: Sun, 3 May 2015 14:46:32 +0900 Subject: [PATCH] Removed the Ext.IsNoStatus methods --- websocket-sharp/Ext.cs | 18 +++++++++--------- websocket-sharp/Server/HttpServer.cs | 4 ++-- websocket-sharp/Server/WebSocketServer.cs | 4 ++-- websocket-sharp/WebSocket.cs | 16 ++++++++-------- 4 files changed, 21 insertions(+), 21 deletions(-) diff --git a/websocket-sharp/Ext.cs b/websocket-sharp/Ext.cs index 45a966e4..1b51729e 100644 --- a/websocket-sharp/Ext.cs +++ b/websocket-sharp/Ext.cs @@ -577,15 +577,15 @@ namespace WebSocketSharp return value.StartsWith (method.ToExtensionString ()); } - internal static bool IsNoStatus (this ushort code) - { - return code == (ushort) CloseStatusCode.NoStatus; - } - - internal static bool IsNoStatus (this CloseStatusCode code) - { - return code == CloseStatusCode.NoStatus; - } +// internal static bool IsNoStatus (this ushort code) +// { +// return code == (ushort) CloseStatusCode.NoStatus; +// } +// +// internal static bool IsNoStatus (this CloseStatusCode code) +// { +// return code == CloseStatusCode.NoStatus; +// } internal static bool IsPortNumber (this int value) { diff --git a/websocket-sharp/Server/HttpServer.cs b/websocket-sharp/Server/HttpServer.cs index 222b30d3..86b0539b 100644 --- a/websocket-sharp/Server/HttpServer.cs +++ b/websocket-sharp/Server/HttpServer.cs @@ -768,7 +768,7 @@ namespace WebSocketSharp.Server _state = ServerState.ShuttingDown; } - if (code.IsNoStatus ()) { + if (code == (ushort) CloseStatusCode.NoStatus) { _services.Stop (new CloseEventArgs (), true, true); } else { @@ -806,7 +806,7 @@ namespace WebSocketSharp.Server _state = ServerState.ShuttingDown; } - if (code.IsNoStatus ()) { + if (code == CloseStatusCode.NoStatus) { _services.Stop (new CloseEventArgs (), true, true); } else { diff --git a/websocket-sharp/Server/WebSocketServer.cs b/websocket-sharp/Server/WebSocketServer.cs index f6159b6d..a1b42b1b 100644 --- a/websocket-sharp/Server/WebSocketServer.cs +++ b/websocket-sharp/Server/WebSocketServer.cs @@ -854,7 +854,7 @@ namespace WebSocketSharp.Server } stopReceiving (5000); - if (code.IsNoStatus ()) { + if (code == (ushort) CloseStatusCode.NoStatus) { _services.Stop (new CloseEventArgs (), true, true); } else { @@ -891,7 +891,7 @@ namespace WebSocketSharp.Server } stopReceiving (5000); - if (code.IsNoStatus ()) { + if (code == CloseStatusCode.NoStatus) { _services.Stop (new CloseEventArgs (), true, true); } else { diff --git a/websocket-sharp/WebSocket.cs b/websocket-sharp/WebSocket.cs index 5b6964b2..0d0c8892 100644 --- a/websocket-sharp/WebSocket.cs +++ b/websocket-sharp/WebSocket.cs @@ -1777,7 +1777,7 @@ namespace WebSocketSharp return; } - if (code.IsNoStatus ()) { + if (code == (ushort) CloseStatusCode.NoStatus) { close (new CloseEventArgs (), true, true); return; } @@ -1806,7 +1806,7 @@ namespace WebSocketSharp return; } - if (code.IsNoStatus ()) { + if (code == CloseStatusCode.NoStatus) { close (new CloseEventArgs (), true, true); return; } @@ -1842,7 +1842,7 @@ namespace WebSocketSharp return; } - if (code.IsNoStatus ()) { + if (code == (ushort) CloseStatusCode.NoStatus) { close (new CloseEventArgs (), true, true); return; } @@ -1878,7 +1878,7 @@ namespace WebSocketSharp return; } - if (code.IsNoStatus ()) { + if (code == CloseStatusCode.NoStatus) { close (new CloseEventArgs (), true, true); return; } @@ -1934,7 +1934,7 @@ namespace WebSocketSharp return; } - if (code.IsNoStatus ()) { + if (code == (ushort) CloseStatusCode.NoStatus) { closeAsync (new CloseEventArgs (), true, true); return; } @@ -1966,7 +1966,7 @@ namespace WebSocketSharp return; } - if (code.IsNoStatus ()) { + if (code == CloseStatusCode.NoStatus) { closeAsync (new CloseEventArgs (), true, true); return; } @@ -2007,7 +2007,7 @@ namespace WebSocketSharp return; } - if (code.IsNoStatus ()) { + if (code == (ushort) CloseStatusCode.NoStatus) { closeAsync (new CloseEventArgs (), true, true); return; } @@ -2049,7 +2049,7 @@ namespace WebSocketSharp return; } - if (code.IsNoStatus ()) { + if (code == CloseStatusCode.NoStatus) { closeAsync (new CloseEventArgs (), true, true); return; }