From 95c8bd00396c8cdf119faf27a7b6fc700e344c62 Mon Sep 17 00:00:00 2001
From: sta <sta.blockhead@gmail.com>
Date: Tue, 10 Apr 2018 17:13:21 +0900
Subject: [PATCH] [Modify] Polish it

---
 .../WebSockets/TcpListenerWebSocketContext.cs    | 16 +++++++++-------
 1 file changed, 9 insertions(+), 7 deletions(-)

diff --git a/websocket-sharp/Net/WebSockets/TcpListenerWebSocketContext.cs b/websocket-sharp/Net/WebSockets/TcpListenerWebSocketContext.cs
index a41b6b83..86f370ec 100644
--- 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;
       }
     }