From 04d8c7f569b3834499f26393bddf6ab7ecd47a85 Mon Sep 17 00:00:00 2001 From: sta Date: Wed, 15 Nov 2017 16:16:18 +0900 Subject: [PATCH] [Modify] Throw exception --- websocket-sharp/WebSocket.cs | 19 +++++++++++++++---- 1 file changed, 15 insertions(+), 4 deletions(-) diff --git a/websocket-sharp/WebSocket.cs b/websocket-sharp/WebSocket.cs index 750524f0..8818633f 100644 --- a/websocket-sharp/WebSocket.cs +++ b/websocket-sharp/WebSocket.cs @@ -3146,10 +3146,21 @@ namespace WebSocketSharp /// public void ConnectAsync () { - string msg; - if (!checkIfAvailable (true, false, true, false, false, true, out msg)) { - _logger.Error (msg); - error ("An error has occurred in connecting.", null); + if (!_client) { + var msg = "This instance is not a client."; + throw new InvalidOperationException (msg); + } + + if (_readyState == WebSocketState.Open) { + var msg = "The connection has already been established."; + _logger.Warn (msg); + + return; + } + + if (_readyState == WebSocketState.Closing) { + var msg = "The close process is in progress."; + _logger.Warn (msg); return; }