[Modify] Polish it

2019-01-18 22:16:55 +09:00
parent 07a28d24d5
commit fb1e0cdd04
1 changed files with 6 additions and 8 deletions
--- a/websocket-sharp/Net/HttpUtility.cs
+++ b/websocket-sharp/Net/HttpUtility.cs
@@ -717,14 +717,12 @@ namespace WebSocketSharp.Net
      }
      else if (requestUri.MaybeUri ()) {
        Uri uri;
-        var valid = Uri.TryCreate (requestUri, UriKind.Absolute, out uri)
-                    && (
-                         (
-                           (schm = uri.Scheme).StartsWith ("http")
-                           && !websocketRequest
-                         )
-                         || (schm.StartsWith ("ws") && websocketRequest)
-                       );
+        if (!Uri.TryCreate (requestUri, UriKind.Absolute, out uri))
+          return null;
+
+        schm = uri.Scheme;
+        var valid = (schm.StartsWith ("http") && !websocketRequest)
+                    || (schm.StartsWith ("ws") && websocketRequest);

        if (!valid)
          return null;