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

[Fix] Lock it early

Browse Source
This commit is contained in:
sta 2016-04-04 04:48:26 +09:00
parent 655acc6528
commit 83a07a988d
1 changed files with 13 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
websocket-sharp/Net/HttpListener.cs
View File

@ -560,15 +560,20 @@ namespace WebSocketSharp.Net
if (!_listening) if (!_listening)
throw new InvalidOperationException ("The listener hasn't been started."); throw new InvalidOperationException ("The listener hasn't been started.");
// Lock _waitQueue early to avoid race conditions. // Lock _ctxRegistrySync early to avoid race conditions.
lock (_waitQueueSync) { lock (_ctxRegistrySync) {
var ctx = getContextFromQueue (); if (!_listening)
if (ctx != null) { throw new InvalidOperationException ("The listener is stopped/closed.");
asyncResult.Complete (ctx, true);
return asyncResult;
}
_waitQueue.Add (asyncResult); lock (_waitQueueSync) {
var ctx = getContextFromQueue ();
if (ctx != null) {
asyncResult.Complete (ctx, true);
return asyncResult;
}
_waitQueue.Add (asyncResult);
}
} }
return asyncResult; return asyncResult;