From 0d9240c58a26b741e7809440473613e2afa2fa46 Mon Sep 17 00:00:00 2001 From: sta Date: Sun, 13 Nov 2016 17:35:42 +0900 Subject: [PATCH] [Modify] Not return a bool --- websocket-sharp/WebSocket.cs | 25 +++++++++---------------- 1 file changed, 9 insertions(+), 16 deletions(-) diff --git a/websocket-sharp/WebSocket.cs b/websocket-sharp/WebSocket.cs index b66d884c..dd759049 100644 --- a/websocket-sharp/WebSocket.cs +++ b/websocket-sharp/WebSocket.cs @@ -1050,13 +1050,10 @@ namespace WebSocketSharp return false; } - try { - _readyState = WebSocketState.Connecting; - if (!doHandshake ()) - return false; + _readyState = WebSocketState.Connecting; - _retryCountForConnect = 1; - _readyState = WebSocketState.Open; + try { + doHandshake (); } catch (Exception ex) { _retryCountForConnect++; @@ -1066,6 +1063,9 @@ namespace WebSocketSharp return false; } + _retryCountForConnect = 1; + _readyState = WebSocketState.Open; + return true; } } @@ -1174,19 +1174,14 @@ namespace WebSocketSharp } // As client - private bool doHandshake () + private void doHandshake () { setClientStream (); var res = sendHandshakeRequest (); string msg; - if (!checkHandshakeResponse (res, out msg)) { - _retryCountForConnect++; - _logger.Fatal (msg); - fatal ("An error has occurred while connecting.", CloseStatusCode.ProtocolError); - - return false; - } + if (!checkHandshakeResponse (res, out msg)) + throw new WebSocketException (CloseStatusCode.ProtocolError, msg); if (_protocolsRequested) _protocol = res.Headers["Sec-WebSocket-Protocol"]; @@ -1195,8 +1190,6 @@ namespace WebSocketSharp processSecWebSocketExtensionsServerHeader (res.Headers["Sec-WebSocket-Extensions"]); processCookies (res.Cookies); - - return true; } private void enqueueToMessageEventQueue (MessageEventArgs e)