Merge remote-tracking branch 'origin/develop' into develop

This commit is contained in:
Christian Kratky
2019-06-23 11:32:11 +02:00
@@ -387,7 +387,10 @@ namespace MQTTnet.Extensions.ManagedClient
//removed it, in which case we don't want to do anything. //removed it, in which case we don't want to do anything.
_messageQueue.RemoveFirst(i => i.Id.Equals(message.Id)); _messageQueue.RemoveFirst(i => i.Id.Equals(message.Id));
} }
_storageManager?.RemoveAsync(message).GetAwaiter().GetResult(); if (_storageManager != null)
{
_storageManager.RemoveAsync(message).GetAwaiter().GetResult();
}
} }
catch (MqttCommunicationException exception) catch (MqttCommunicationException exception)
{ {
@@ -408,6 +411,10 @@ namespace MQTTnet.Extensions.ManagedClient
{ {
_messageQueue.RemoveFirst(i => i.Id.Equals(message.Id)); _messageQueue.RemoveFirst(i => i.Id.Equals(message.Id));
} }
if (_storageManager != null)
{
_storageManager.RemoveAsync(message).GetAwaiter().GetResult();
}
} }
} }
catch (Exception exception) catch (Exception exception)