From 9bce5b03f23e65bc5783ac41b401dce058a055f5 Mon Sep 17 00:00:00 2001
From: sta <sta.blockhead@gmail.com>
Date: Fri, 17 Nov 2017 16:20:35 +0900
Subject: [PATCH] [Modify] Throw exception

---
 websocket-sharp/WebSocket.cs | 36 ++++++++++++++----------------------
 1 file changed, 14 insertions(+), 22 deletions(-)

diff --git a/websocket-sharp/WebSocket.cs b/websocket-sharp/WebSocket.cs
index 8791fe9c..2cfa1d3d 100644
--- a/websocket-sharp/WebSocket.cs
+++ b/websocket-sharp/WebSocket.cs
@@ -1219,6 +1219,13 @@ namespace WebSocketSharp
     // As client
     private bool connect ()
     {
+      if (_readyState == WebSocketState.Open) {
+        var msg = "The connection has already been established.";
+        _logger.Warn (msg);
+
+        return false;
+      }
+
       lock (_forState) {
         if (_readyState == WebSocketState.Open) {
           var msg = "The connection has already been established.";
@@ -1228,8 +1235,11 @@ namespace WebSocketSharp
         }
 
         if (_readyState == WebSocketState.Closing) {
-          var msg = "The close process is in progress.";
-          _logger.Warn (msg);
+          var msg = "The close process has set in.";
+          _logger.Error (msg);
+
+          msg = "An interruption has occurred while attempting to connect.";
+          error (msg, null);
 
           return false;
         }
@@ -3127,18 +3137,9 @@ namespace WebSocketSharp
         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;
+        throw new InvalidOperationException (msg);
       }
 
       if (connect ())
@@ -3167,18 +3168,9 @@ namespace WebSocketSharp
         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;
+        throw new InvalidOperationException (msg);
       }
 
       Func<bool> connector = connect;