addressed feedback

This commit is contained in:
JanEggers
2018-07-19 21:13:28 +02:00
parent 53bd2a0960
commit ae80de26ec
+5 -5
View File
@@ -29,7 +29,7 @@ namespace MQTTnet.Server
private MqttApplicationMessage _willMessage; private MqttApplicationMessage _willMessage;
private bool _wasCleanDisconnect; private bool _wasCleanDisconnect;
private IMqttChannelAdapter _adapter; private IMqttChannelAdapter _adapter;
private Task<bool> _run; private Task<bool> _workerTask;
private IDisposable _cleanupHandle; private IDisposable _cleanupHandle;
public MqttClientSession( public MqttClientSession(
@@ -69,8 +69,8 @@ namespace MQTTnet.Server
public Task<bool> RunAsync(MqttConnectPacket connectPacket, IMqttChannelAdapter adapter) public Task<bool> RunAsync(MqttConnectPacket connectPacket, IMqttChannelAdapter adapter)
{ {
_run = RunInternalAsync(connectPacket, adapter); _workerTask = RunInternalAsync(connectPacket, adapter);
return _run; return _workerTask;
} }
private async Task<bool> RunInternalAsync(MqttConnectPacket connectPacket, IMqttChannelAdapter adapter) private async Task<bool> RunInternalAsync(MqttConnectPacket connectPacket, IMqttChannelAdapter adapter)
@@ -134,7 +134,7 @@ namespace MQTTnet.Server
{ {
_adapter.ReadingPacketStarted -= OnAdapterReadingPacketStarted; _adapter.ReadingPacketStarted -= OnAdapterReadingPacketStarted;
_adapter.ReadingPacketCompleted -= OnAdapterReadingPacketCompleted; _adapter.ReadingPacketCompleted -= OnAdapterReadingPacketCompleted;
await Cleanup(); await Cleanup().ConfigureAwait(false);
} }
_adapter = null; _adapter = null;
@@ -183,7 +183,7 @@ namespace MQTTnet.Server
_willMessage = null; _willMessage = null;
_run?.GetAwaiter().GetResult(); _workerTask?.GetAwaiter().GetResult();
} }
finally finally
{ {