From 09a64d67be836adb10641af586737f7c4371de72 Mon Sep 17 00:00:00 2001
From: sta <sta.blockhead@gmail.com>
Date: Thu, 20 Aug 2015 16:36:14 +0900
Subject: [PATCH] Added the WebSocket.CheckSendParameter methods

---
 websocket-sharp/Ext.cs                        | 15 -----------
 .../Server/WebSocketServiceManager.cs         | 16 ++++++++---
 .../Server/WebSocketSessionManager.cs         | 16 ++++++++---
 websocket-sharp/WebSocket.cs                  | 27 ++++++++++++++-----
 4 files changed, 45 insertions(+), 29 deletions(-)

diff --git a/websocket-sharp/Ext.cs b/websocket-sharp/Ext.cs
index 4d781d32..634538e5 100644
--- a/websocket-sharp/Ext.cs
+++ b/websocket-sharp/Ext.cs
@@ -241,21 +241,6 @@ namespace WebSocketSharp
                : null;
     }
 
-    internal static string CheckIfValidSendData (this byte[] data)
-    {
-      return data == null ? "'data' is null." : null;
-    }
-
-    internal static string CheckIfValidSendData (this FileInfo file)
-    {
-      return file == null ? "'file' is null." : null;
-    }
-
-    internal static string CheckIfValidSendData (this string data)
-    {
-      return data == null ? "'data' is null." : null;
-    }
-
     internal static string CheckIfValidServicePath (this string path)
     {
       return path == null || path.Length == 0
diff --git a/websocket-sharp/Server/WebSocketServiceManager.cs b/websocket-sharp/Server/WebSocketServiceManager.cs
index 2e3a218b..bd1269d9 100644
--- a/websocket-sharp/Server/WebSocketServiceManager.cs
+++ b/websocket-sharp/Server/WebSocketServiceManager.cs
@@ -385,7 +385,9 @@ namespace WebSocketSharp.Server
     /// </param>
     public void Broadcast (byte[] data)
     {
-      var msg = _state.CheckIfAvailable (false, true, false) ?? data.CheckIfValidSendData ();
+      var msg = _state.CheckIfAvailable (false, true, false) ??
+                WebSocket.CheckSendParameter (data);
+
       if (msg != null) {
         _logger.Error (msg);
         return;
@@ -405,7 +407,9 @@ namespace WebSocketSharp.Server
     /// </param>
     public void Broadcast (string data)
     {
-      var msg = _state.CheckIfAvailable (false, true, false) ?? data.CheckIfValidSendData ();
+      var msg = _state.CheckIfAvailable (false, true, false) ??
+                WebSocket.CheckSendParameter (data);
+
       if (msg != null) {
         _logger.Error (msg);
         return;
@@ -434,7 +438,9 @@ namespace WebSocketSharp.Server
     /// </param>
     public void BroadcastAsync (byte[] data, Action completed)
     {
-      var msg = _state.CheckIfAvailable (false, true, false) ?? data.CheckIfValidSendData ();
+      var msg = _state.CheckIfAvailable (false, true, false) ??
+                WebSocket.CheckSendParameter (data);
+
       if (msg != null) {
         _logger.Error (msg);
         return;
@@ -462,7 +468,9 @@ namespace WebSocketSharp.Server
     /// </param>
     public void BroadcastAsync (string data, Action completed)
     {
-      var msg = _state.CheckIfAvailable (false, true, false) ?? data.CheckIfValidSendData ();
+      var msg = _state.CheckIfAvailable (false, true, false) ??
+                WebSocket.CheckSendParameter (data);
+
       if (msg != null) {
         _logger.Error (msg);
         return;
diff --git a/websocket-sharp/Server/WebSocketSessionManager.cs b/websocket-sharp/Server/WebSocketSessionManager.cs
index ddd0ca6f..de472925 100644
--- a/websocket-sharp/Server/WebSocketSessionManager.cs
+++ b/websocket-sharp/Server/WebSocketSessionManager.cs
@@ -393,7 +393,9 @@ namespace WebSocketSharp.Server
     /// </param>
     public void Broadcast (byte[] data)
     {
-      var msg = _state.CheckIfAvailable (false, true, false) ?? data.CheckIfValidSendData ();
+      var msg = _state.CheckIfAvailable (false, true, false) ??
+                WebSocket.CheckSendParameter (data);
+
       if (msg != null) {
         _logger.Error (msg);
         return;
@@ -413,7 +415,9 @@ namespace WebSocketSharp.Server
     /// </param>
     public void Broadcast (string data)
     {
-      var msg = _state.CheckIfAvailable (false, true, false) ?? data.CheckIfValidSendData ();
+      var msg = _state.CheckIfAvailable (false, true, false) ??
+                WebSocket.CheckSendParameter (data);
+
       if (msg != null) {
         _logger.Error (msg);
         return;
@@ -442,7 +446,9 @@ namespace WebSocketSharp.Server
     /// </param>
     public void BroadcastAsync (byte[] data, Action completed)
     {
-      var msg = _state.CheckIfAvailable (false, true, false) ?? data.CheckIfValidSendData ();
+      var msg = _state.CheckIfAvailable (false, true, false) ??
+                WebSocket.CheckSendParameter (data);
+
       if (msg != null) {
         _logger.Error (msg);
         return;
@@ -470,7 +476,9 @@ namespace WebSocketSharp.Server
     /// </param>
     public void BroadcastAsync (string data, Action completed)
     {
-      var msg = _state.CheckIfAvailable (false, true, false) ?? data.CheckIfValidSendData ();
+      var msg = _state.CheckIfAvailable (false, true, false) ??
+                WebSocket.CheckSendParameter (data);
+
       if (msg != null) {
         _logger.Error (msg);
         return;
diff --git a/websocket-sharp/WebSocket.cs b/websocket-sharp/WebSocket.cs
index ae90b230..77fcc7fd 100644
--- a/websocket-sharp/WebSocket.cs
+++ b/websocket-sharp/WebSocket.cs
@@ -1625,6 +1625,21 @@ namespace WebSocketSharp
       return bytes.Length > 125 ? "A message has greater than the allowable max size." : null;
     }
 
+    internal static string CheckSendParameter (byte[] data)
+    {
+      return data == null ? "'data' is null." : null;
+    }
+
+    internal static string CheckSendParameter (FileInfo file)
+    {
+      return file == null ? "'file' is null." : null;
+    }
+
+    internal static string CheckSendParameter (string data)
+    {
+      return data == null ? "'data' is null." : null;
+    }
+
     // As server
     internal void Close (HttpResponse response)
     {
@@ -2249,7 +2264,7 @@ namespace WebSocketSharp
     public void Send (byte[] data)
     {
       var msg = _readyState.CheckIfAvailable (false, true, false, false) ??
-                data.CheckIfValidSendData ();
+                CheckSendParameter (data);
 
       if (msg != null) {
         _logger.Error (msg);
@@ -2270,7 +2285,7 @@ namespace WebSocketSharp
     public void Send (FileInfo file)
     {
       var msg = _readyState.CheckIfAvailable (false, true, false, false) ??
-                file.CheckIfValidSendData ();
+                CheckSendParameter (file);
 
       if (msg != null) {
         _logger.Error (msg);
@@ -2291,7 +2306,7 @@ namespace WebSocketSharp
     public void Send (string data)
     {
       var msg = _readyState.CheckIfAvailable (false, true, false, false) ??
-                data.CheckIfValidSendData ();
+                CheckSendParameter (data);
 
       if (msg != null) {
         _logger.Error (msg);
@@ -2320,7 +2335,7 @@ namespace WebSocketSharp
     public void SendAsync (byte[] data, Action<bool> completed)
     {
       var msg = _readyState.CheckIfAvailable (false, true, false, false) ??
-                data.CheckIfValidSendData ();
+                CheckSendParameter (data);
 
       if (msg != null) {
         _logger.Error (msg);
@@ -2350,7 +2365,7 @@ namespace WebSocketSharp
     public void SendAsync (FileInfo file, Action<bool> completed)
     {
       var msg = _readyState.CheckIfAvailable (false, true, false, false) ??
-                file.CheckIfValidSendData ();
+                CheckSendParameter (file);
 
       if (msg != null) {
         _logger.Error (msg);
@@ -2379,7 +2394,7 @@ namespace WebSocketSharp
     public void SendAsync (string data, Action<bool> completed)
     {
       var msg = _readyState.CheckIfAvailable (false, true, false, false) ??
-                data.CheckIfValidSendData ();
+                CheckSendParameter (data);
 
       if (msg != null) {
         _logger.Error (msg);