DevWiki/websocket-sharp
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

[Modify] Rename it

Browse Source
This commit is contained in:
sta 2016-12-08 13:14:16 +09:00
parent 2b06dedec9
commit 10fe8a9629
1 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
websocket-sharp/WebSocket.cs
View File

@ -78,7 +78,6 @@ namespace WebSocketSharp
private NetworkCredential _credentials; private NetworkCredential _credentials;
private bool _emitOnPing; private bool _emitOnPing;
private bool _enableRedirection; private bool _enableRedirection;
private ManualResetEvent _exitReceiving;
private string _extensions; private string _extensions;
private bool _extensionsRequested; private bool _extensionsRequested;
private object _forMessageEventQueue; private object _forMessageEventQueue;
@ -107,6 +106,7 @@ namespace WebSocketSharp
private NetworkCredential _proxyCredentials; private NetworkCredential _proxyCredentials;
private Uri _proxyUri; private Uri _proxyUri;
private volatile WebSocketState _readyState; private volatile WebSocketState _readyState;
private ManualResetEvent _receivingExited;
private int _retryCountForConnect; private int _retryCountForConnect;
private bool _secure; private bool _secure;
private ClientSslConfiguration _sslConfig; private ClientSslConfiguration _sslConfig;
@ -1024,7 +1024,7 @@ namespace WebSocketSharp
{ {
var sent = frameAsBytes != null && sendBytes (frameAsBytes); var sent = frameAsBytes != null && sendBytes (frameAsBytes);
received = received || received = received ||
(receive && sent && _exitReceiving != null && _exitReceiving.WaitOne (_waitTime)); (receive && sent && _receivingExited != null && _receivingExited.WaitOne (_waitTime));
var ret = sent && received; var ret = sent && received;
_logger.Debug ( _logger.Debug (
@ -1538,9 +1538,9 @@ namespace WebSocketSharp
_pongReceived = null; _pongReceived = null;
} }
if (_exitReceiving != null) { if (_receivingExited != null) {
_exitReceiving.Close (); _receivingExited.Close ();
_exitReceiving = null; _receivingExited = null;
} }
} }
@ -1872,8 +1872,8 @@ namespace WebSocketSharp
if (_messageEventQueue.Count > 0) if (_messageEventQueue.Count > 0)
_messageEventQueue.Clear (); _messageEventQueue.Clear ();
_exitReceiving = new ManualResetEvent (false);
_pongReceived = new ManualResetEvent (false); _pongReceived = new ManualResetEvent (false);
_receivingExited = new ManualResetEvent (false);
Action receive = null; Action receive = null;
receive = receive =
@ -1883,9 +1883,9 @@ namespace WebSocketSharp
false, false,
frame => { frame => {
if (!processReceivedFrame (frame) || _readyState == WebSocketState.Closed) { if (!processReceivedFrame (frame) || _readyState == WebSocketState.Closed) {
var exit = _exitReceiving; var exited = _receivingExited;
if (exit != null) if (exited != null)
exit.Set (); exited.Set ();
return; return;
} }