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

Replaced TaskCanceledException catches with OperationCanceledException catches for .net framework

Browse Source
This commit is contained in:
Jkorf 2021-08-13 15:45:20 +02:00
parent 3d8c33094d
commit 05805c87c2
3 changed files with 9 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
CryptoExchange.Net/CryptoExchange.Net.xml
View File

@ -3818,7 +3818,9 @@
<member name="M:CryptoExchange.Net.Sockets.WebsocketFactory.CreateWebsocket(CryptoExchange.Net.Logging.Log,System.String,System.Collections.Generic.IDictionary{System.String,System.String},System.Collections.Generic.IDictionary{System.String,System.String})"> <member name="M:CryptoExchange.Net.Sockets.WebsocketFactory.CreateWebsocket(CryptoExchange.Net.Logging.Log,System.String,System.Collections.Generic.IDictionary{System.String,System.String},System.Collections.Generic.IDictionary{System.String,System.String})">
<inheritdoc /> <inheritdoc />
</member> </member>
<member name="T:System.Diagnostics.CodeAnalysis.AllowNullAttribute"> </members>
</doc>
System.Diagnostics.CodeAnalysis.AllowNullAttribute">
<summary> <summary>
Specifies that <see langword="null"/> is allowed as an input even if the Specifies that <see langword="null"/> is allowed as an input even if the
corresponding type disallows it. corresponding type disallows it.

2
CryptoExchange.Net/RestClient.cs
View File

@ -284,7 +284,7 @@ namespace CryptoExchange.Net
log.Write(LogLevel.Warning, $"[{request.RequestId}] Request exception: " + exceptionInfo); log.Write(LogLevel.Warning, $"[{request.RequestId}] Request exception: " + exceptionInfo);
return new WebCallResult<T>(null, null, default, new WebError(exceptionInfo)); return new WebCallResult<T>(null, null, default, new WebError(exceptionInfo));
} }
catch (TaskCanceledException canceledException) catch (OperationCanceledException canceledException)
{ {
if (canceledException.CancellationToken == cancellationToken) if (canceledException.CancellationToken == cancellationToken)
{ {

10
CryptoExchange.Net/Sockets/CryptoExchangeWebSocketClient.cs
View File

@ -339,7 +339,7 @@ namespace CryptoExchange.Net.Sockets
{ {
await _socket.SendAsync(new ArraySegment<byte>(data, 0, data.Length), WebSocketMessageType.Text, true, _ctsSource.Token).ConfigureAwait(false); await _socket.SendAsync(new ArraySegment<byte>(data, 0, data.Length), WebSocketMessageType.Text, true, _ctsSource.Token).ConfigureAwait(false);
} }
catch (TaskCanceledException) catch (OperationCanceledException)
{ {
// cancelled // cancelled
break; break;
@ -377,9 +377,9 @@ namespace CryptoExchange.Net.Sockets
receiveResult = await _socket.ReceiveAsync(buffer, _ctsSource.Token).ConfigureAwait(false); receiveResult = await _socket.ReceiveAsync(buffer, _ctsSource.Token).ConfigureAwait(false);
received += receiveResult.Count; received += receiveResult.Count;
} }
catch (TaskCanceledException) catch (OperationCanceledException)
{ {
// Cancelled // cancelled
break; break;
} }
catch (WebSocketException wse) catch (WebSocketException wse)
@ -513,10 +513,10 @@ namespace CryptoExchange.Net.Sockets
{ {
await Task.Delay(500, _ctsSource.Token).ConfigureAwait(false); await Task.Delay(500, _ctsSource.Token).ConfigureAwait(false);
} }
catch(TaskCanceledException) catch (OperationCanceledException)
{ {
// cancelled // cancelled
return; break;
} }
} }
} }