From d99c6f56ee61d0b70dc8a4c5558e464256cd6929 Mon Sep 17 00:00:00 2001 From: sta Date: Thu, 8 Dec 2016 13:53:08 +0900 Subject: [PATCH] [Modify] Polish it --- websocket-sharp/WebSocket.cs | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-) diff --git a/websocket-sharp/WebSocket.cs b/websocket-sharp/WebSocket.cs index 5c1f1cc1..b1805e40 100644 --- a/websocket-sharp/WebSocket.cs +++ b/websocket-sharp/WebSocket.cs @@ -1023,12 +1023,18 @@ namespace WebSocketSharp private bool closeHandshake (byte[] frameAsBytes, bool receive, bool received) { var sent = frameAsBytes != null && sendBytes (frameAsBytes); - received = received || - (receive && sent && _receivingExited != null && _receivingExited.WaitOne (_waitTime)); + + var wait = !received && sent && receive && _receivingExited != null; + if (wait) + received = _receivingExited.WaitOne (_waitTime); var ret = sent && received; + _logger.Debug ( - String.Format ("Was clean?: {0}\n sent: {1}\n received: {2}", ret, sent, received)); + String.Format ( + "Was clean?: {0}\n sent: {1}\n received: {2}", ret, sent, received + ) + ); return ret; }