From 246a10649ac261d44c8dc3954d951f6629212b83 Mon Sep 17 00:00:00 2001
From: Christian Kratky <christian.kratky@googlemail.com>
Date: Fri, 12 Jun 2020 11:19:29 +0200
Subject: [PATCH] Minor refactorings.

---
 Source/MQTTnet/Client/MqttClient.cs                | 12 +++---------
 Source/MQTTnet/Server/MqttClientSessionsManager.cs | 12 ++++--------
 2 files changed, 7 insertions(+), 17 deletions(-)

diff --git a/Source/MQTTnet/Client/MqttClient.cs b/Source/MQTTnet/Client/MqttClient.cs
index da7d6e66..5be12034 100644
--- a/Source/MQTTnet/Client/MqttClient.cs
+++ b/Source/MQTTnet/Client/MqttClient.cs
@@ -57,13 +57,7 @@ namespace MQTTnet.Client
 
         public IMqttApplicationMessageReceivedHandler ApplicationMessageReceivedHandler { get; set; }
 
-        public bool IsConnected
-        {
-            get
-            {
-                return _isConnected && Interlocked.Read(ref _isDisconnectPending) == 0;
-            }
-        }
+        public bool IsConnected => _isConnected && Interlocked.Read(ref _isDisconnectPending) == 0;
 
         public IMqttClientOptions Options { get; private set; }
 
@@ -164,9 +158,9 @@ namespace MQTTnet.Client
             }
         }
 
-        public async Task PingAsync(CancellationToken cancellationToken)
+        public Task PingAsync(CancellationToken cancellationToken)
         {
-            await SendAndReceiveAsync<MqttPingRespPacket>(new MqttPingReqPacket(), cancellationToken).ConfigureAwait(false);
+            return SendAndReceiveAsync<MqttPingRespPacket>(new MqttPingReqPacket(), cancellationToken);
         }
 
         public Task SendExtendedAuthenticationExchangeDataAsync(MqttExtendedAuthenticationExchangeData data, CancellationToken cancellationToken)
diff --git a/Source/MQTTnet/Server/MqttClientSessionsManager.cs b/Source/MQTTnet/Server/MqttClientSessionsManager.cs
index 7850780f..5ac84638 100644
--- a/Source/MQTTnet/Server/MqttClientSessionsManager.cs
+++ b/Source/MQTTnet/Server/MqttClientSessionsManager.cs
@@ -14,7 +14,7 @@ using System.Threading.Tasks;
 
 namespace MQTTnet.Server
 {
-    public class MqttClientSessionsManager : Disposable
+    public sealed class MqttClientSessionsManager : IDisposable
     {
         readonly AsyncQueue<MqttEnqueuedApplicationMessage> _messageQueue = new AsyncQueue<MqttEnqueuedApplicationMessage>();
 
@@ -150,13 +150,9 @@ namespace MQTTnet.Server
             _logger.Verbose("Session for client '{0}' deleted.", clientId);
         }
 
-        protected override void Dispose(bool disposing)
+        public void Dispose()
         {
-            if (disposing)
-            {
-                _messageQueue?.Dispose();
-            }
-            base.Dispose(disposing);
+            _messageQueue?.Dispose();
         }
 
         async Task TryProcessQueuedApplicationMessagesAsync(CancellationToken cancellationToken)
@@ -245,9 +241,9 @@ namespace MQTTnet.Server
         {
             string clientId = null;
 
-            MqttConnectPacket connectPacket;
             try
             {
+                MqttConnectPacket connectPacket;
                 try
                 {
                     var firstPacket = await channelAdapter.ReceivePacketAsync(_options.DefaultCommunicationTimeout, cancellationToken).ConfigureAwait(false);