From f096e3b561f38c5d4f1febaadf6a142a371bf324 Mon Sep 17 00:00:00 2001 From: sta Date: Sat, 19 Mar 2016 16:25:47 +0900 Subject: [PATCH] [Modify] Replace it --- websocket-sharp/WebSocket.cs | 13 +++++++++---- 1 file changed, 9 insertions(+), 4 deletions(-) diff --git a/websocket-sharp/WebSocket.cs b/websocket-sharp/WebSocket.cs index 6b2a92b1..1befcfa0 100644 --- a/websocket-sharp/WebSocket.cs +++ b/websocket-sharp/WebSocket.cs @@ -2776,16 +2776,21 @@ namespace WebSocketSharp public void SetCookie (Cookie cookie) { lock (_forConn) { - var msg = checkIfAvailable (true, false, true, false, false, true) ?? - (cookie == null ? "'cookie' is null." : null); - - if (msg != null) { + string msg; + if (!checkIfAvailable (true, false, true, false, false, true, out msg)) { _logger.Error (msg); error ("An error has occurred in setting a cookie.", null); return; } + if (cookie == null) { + _logger.Error ("'cookie' is null."); + error ("An error has occurred in setting a cookie.", null); + + return; + } + lock (_cookies.SyncRoot) _cookies.SetOrRemove (cookie); }