From 8b6e2ecd6162b4fdb2a2d3b11d62aed3d896d213 Mon Sep 17 00:00:00 2001 From: sta Date: Thu, 8 Dec 2016 14:56:52 +0900 Subject: [PATCH] [Modify] Throw exceptions --- websocket-sharp/WebSocket.cs | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/websocket-sharp/WebSocket.cs b/websocket-sharp/WebSocket.cs index 224f5a36..640f1d91 100644 --- a/websocket-sharp/WebSocket.cs +++ b/websocket-sharp/WebSocket.cs @@ -2699,19 +2699,19 @@ namespace WebSocketSharp /// public bool Ping (string message) { - if (message == null || message.Length == 0) - return Ping (); + if (message == null) + throw new ArgumentNullException ("message"); - byte[] data; - var msg = CheckPingParameter (message, out data); - if (msg != null) { - _logger.Error (msg); - error ("An error has occurred in sending a ping.", null); + byte[] bytes; + if (!message.TryGetUTF8EncodedBytes (out bytes)) + throw new ArgumentException ("It could not be UTF8 encoded.", "message"); - return false; + if (bytes.Length > 125) { + var msg = "Its size is greater than 125 bytes."; + throw new ArgumentOutOfRangeException ("message", msg); } - return Ping (WebSocketFrame.CreatePingFrame (data, _client).ToArray (), _waitTime); + return ping (bytes); } ///