flywithu/CryptoExchange.Net
1
0
Fork 0
mirror of https://github.com/JKorf/CryptoExchange.Net synced 2025-06-09 17:06:19 +00:00
Code Issues Releases Wiki Activity

Protect pendingRequest list from concurrent access.

Browse Source
This commit is contained in:
Eric Garnier 2020-12-20 10:59:38 +01:00
parent 9deae358ac
commit 0db71a3fb6
1 changed files with 14 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
CryptoExchange.Net/Sockets/SocketConnection.cs
View File

@ -148,11 +148,19 @@ namespace CryptoExchange.Net.Sockets
} }
var handledResponse = false; var handledResponse = false;
foreach (var pendingRequest in pendingRequests.ToList()) PendingRequest[] requests;
lock(pendingRequests)
{
requests = pendingRequests.ToArray();
}
foreach (var pendingRequest in requests)
{ {
if (pendingRequest.Check(tokenData)) if (pendingRequest.Check(tokenData))
{ {
pendingRequests.Remove(pendingRequest); lock (pendingRequests)
{
pendingRequests.Remove(pendingRequest);
}
if (pendingRequest.Result == null) if (pendingRequest.Result == null)
{ {
continue; // A previous timeout. continue; // A previous timeout.
@ -237,7 +245,10 @@ namespace CryptoExchange.Net.Sockets
public virtual Task SendAndWait<T>(T obj, TimeSpan timeout, Func<JToken, bool> handler) public virtual Task SendAndWait<T>(T obj, TimeSpan timeout, Func<JToken, bool> handler)
{ {
var pending = new PendingRequest(handler, timeout); var pending = new PendingRequest(handler, timeout);
pendingRequests.Add(pending); lock (pendingRequests)
{
pendingRequests.Add(pending);
}
Send(obj); Send(obj);
return pending.Event.WaitOneAsync(timeout); return pending.Event.WaitOneAsync(timeout);
} }