[Modify] Polish it

2018-04-10 17:13:21 +09:00 · 2018-04-10 17:13:21 +09:00 · 95c8bd0039
commit 95c8bd0039
parent d89ca315af
1 changed files with 9 additions and 7 deletions
--- a/websocket-sharp/Net/WebSockets/TcpListenerWebSocketContext.cs
+++ b/websocket-sharp/Net/WebSockets/TcpListenerWebSocketContext.cs
@ -235,13 +235,15 @@ namespace WebSocketSharp.Net.WebSockets
    /// </value>
    public override NameValueCollection QueryString {
      get {
-        return _queryString
-               ?? (
-                 _queryString =
-                   HttpUtility.InternalParseQueryString (
-                     _uri != null ? _uri.Query : null, Encoding.UTF8
-                   )
-               );
+        if (_queryString == null) {
+          var uri = RequestUri;
+          _queryString = HttpUtility.InternalParseQueryString (
+                           uri != null ? uri.Query : null,
+                           Encoding.UTF8
+                         );
+        }
+
+        return _queryString;
      }
    }