Merge branch 'master' of https://github.com/chkr1011/MQTTnet

grammy-work · Mar 10, 2019 · 67c9177 · 67c9177
2 parents 007991f + 532ddde
commit 67c9177
Showing 1 changed file with 2 additions and 2 deletions.
diff --git a/Source/MQTTnet/Server/MqttServer.cs b/Source/MQTTnet/Server/MqttServer.cs
@@ -120,10 +120,10 @@ public async Task StopAsync()
                 {
                     return;
                 }
-
-                _cancellationTokenSource.Cancel(false);
 
                 _clientSessionsManager.Stop();
+
+                _cancellationTokenSource.Cancel(false);
 
                 foreach (var adapter in _adapters)
                 {