Fix issues with exception handling after disconnect

dotnet · Sep 20, 2017 · 50800b1 · 50800b1
1 parent dcf6f94
commit 50800b1
Showing 1 changed file with 10 additions and 0 deletions.
diff --git a/MQTTnet.Core/Client/MqttClient.cs b/MQTTnet.Core/Client/MqttClient.cs
@@ -352,6 +352,11 @@ private async Task SendKeepAliveMessagesAsync(CancellationToken cancellationToke
             }
             catch (MqttCommunicationException exception)
             {
+                if (cancellationToken.IsCancellationRequested)
+                {
+                    return;
+                }
+
                 MqttTrace.Warning(nameof(MqttClient), exception, "MQTT communication exception while sending/receiving keep alive packets.");
                 await DisconnectInternalAsync().ConfigureAwait(false);
             }
@@ -388,6 +393,11 @@ private async Task ReceivePackets(CancellationToken cancellationToken)
             }
             catch (MqttCommunicationException exception)
             {
+                if (cancellationToken.IsCancellationRequested)
+                {
+                    return;
+                }
+
                 MqttTrace.Warning(nameof(MqttClient), exception, "MQTT communication exception while receiving packets.");
                 await DisconnectInternalAsync().ConfigureAwait(false);
             }