YangWX/MQTTnet
1
0
Fork 0
mirror of https://github.com/dotnet/MQTTnet.git synced 2026-10-18 18:43:10 +08:00
Code Issues Packages Projects Releases Wiki Activity

Fix build errors due to merge conflicts

Browse Source
This commit is contained in:
Christian
2022-11-11 14:41:28 +01:00
parent db1fc7625d
commit 4eb6e77eb5
1 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Source/MQTTnet/Adapter/MqttChannelAdapter.cs
+2 -2
View File
@@ -298,7 +298,7 @@ namespace MQTTnet.Adapter
// Check two times for cancellation because the call to _ReadAsync_ might block for some time. // Check two times for cancellation because the call to _ReadAsync_ might block for some time.
if (cancellationToken.IsCancellationRequested) if (cancellationToken.IsCancellationRequested)
{ {
return ReadFixedHeaderResult.Cancelled; return ReadFixedHeaderResult.Canceled;
} }
int bytesRead; int bytesRead;
@@ -308,7 +308,7 @@ namespace MQTTnet.Adapter
} }
catch (OperationCanceledException) catch (OperationCanceledException)
{ {
return ReadFixedHeaderResult.Cancelled; return ReadFixedHeaderResult.Canceled;
} }
catch (SocketException) catch (SocketException)
{ {