From 6817a3aa0061ebe676d1cc5b5274e25f631cead9 Mon Sep 17 00:00:00 2001
From: sta <sta.blockhead@gmail.com>
Date: Sat, 12 Mar 2016 15:44:31 +0900
Subject: [PATCH] [Modify] Replace it

---
 websocket-sharp/WebSocket.cs | 24 +++++++++++++-----------
 1 file changed, 13 insertions(+), 11 deletions(-)

diff --git a/websocket-sharp/WebSocket.cs b/websocket-sharp/WebSocket.cs
index d628b5b2..035e947b 100644
--- a/websocket-sharp/WebSocket.cs
+++ b/websocket-sharp/WebSocket.cs
@@ -482,20 +482,22 @@ namespace WebSocketSharp
 
       set {
         lock (_forConn) {
-          var msg = checkIfAvailable (true, false, true, false, false, true);
-          if (msg == null) {
-            if (value.IsNullOrEmpty ()) {
-              _origin = value;
-              return;
-            }
+          string msg;
+          if (!checkIfAvailable (true, false, true, false, false, true, out msg)) {
+            _logger.Error (msg);
+            error ("An error has occurred in setting the origin.", null);
 
-            Uri origin;
-            if (!Uri.TryCreate (value, UriKind.Absolute, out origin) || origin.Segments.Length > 1)
-              msg = "The syntax of an origin must be '<scheme>://<host>[:<port>]'.";
+            return;
           }
 
-          if (msg != null) {
-            _logger.Error (msg);
+          if (value.IsNullOrEmpty ()) {
+            _origin = value;
+            return;
+          }
+
+          Uri origin;
+          if (!Uri.TryCreate (value, UriKind.Absolute, out origin) || origin.Segments.Length > 1) {
+            _logger.Error ("The syntax of an origin must be '<scheme>://<host>[:<port>]'.");
             error ("An error has occurred in setting the origin.", null);
 
             return;