From 38d3531db617840ed848fffdcbb2b6493aa2e48d Mon Sep 17 00:00:00 2001
From: Christian Kratky <christian.kratky@googlemail.com>
Date: Wed, 11 Nov 2020 21:11:49 +0100
Subject: [PATCH] Refactor code.

---
 Source/MQTTnet/Server/MqttClientConnection.cs | 45 +++++++++----------
 1 file changed, 21 insertions(+), 24 deletions(-)

diff --git a/Source/MQTTnet/Server/MqttClientConnection.cs b/Source/MQTTnet/Server/MqttClientConnection.cs
index f3f13350..2945bc2a 100644
--- a/Source/MQTTnet/Server/MqttClientConnection.cs
+++ b/Source/MQTTnet/Server/MqttClientConnection.cs
@@ -186,40 +186,24 @@ namespace MQTTnet.Server
                     if (packet is MqttPublishPacket publishPacket)
                     {
                         await HandleIncomingPublishPacketAsync(publishPacket, cancellationToken).ConfigureAwait(false);
-                        continue;
                     }
-
-                    if (packet is MqttPubRelPacket pubRelPacket)
+                    else if (packet is MqttPubRelPacket pubRelPacket)
                     {
-                        var pubCompPacket = new MqttPubCompPacket
-                        {
-                            PacketIdentifier = pubRelPacket.PacketIdentifier,
-                            ReasonCode = MqttPubCompReasonCode.Success
-                        };
-
-                        await SendAsync(pubCompPacket, cancellationToken).ConfigureAwait(false);
-                        continue;
+                        await HandleIncomingPubRelPacketAsync(pubRelPacket, cancellationToken).ConfigureAwait(false);
                     }
-
-                    if (packet is MqttSubscribePacket subscribePacket)
+                    else if (packet is MqttSubscribePacket subscribePacket)
                     {
                         await HandleIncomingSubscribePacketAsync(subscribePacket, cancellationToken).ConfigureAwait(false);
-                        continue;
                     }
-
-                    if (packet is MqttUnsubscribePacket unsubscribePacket)
+                    else if (packet is MqttUnsubscribePacket unsubscribePacket)
                     {
                         await HandleIncomingUnsubscribePacketAsync(unsubscribePacket, cancellationToken).ConfigureAwait(false);
-                        continue;
                     }
-
-                    if (packet is MqttPingReqPacket)
+                    else if (packet is MqttPingReqPacket)
                     {
                         await SendAsync(MqttPingRespPacket.Instance, cancellationToken).ConfigureAwait(false);
-                        continue;
                     }
-
-                    if (packet is MqttDisconnectPacket)
+                    else if (packet is MqttDisconnectPacket)
                     {
                         Session.WillMessage = null;
                         disconnectType = MqttClientDisconnectType.Clean;
@@ -227,8 +211,10 @@ namespace MQTTnet.Server
                         StopInternal();
                         return;
                     }
-
-                    _packetDispatcher.Dispatch(packet);
+                    else
+                    {
+                        _packetDispatcher.Dispatch(packet);
+                    }
                 }
             }
             catch (OperationCanceledException)
@@ -289,6 +275,17 @@ namespace MQTTnet.Server
             }
         }
 
+        Task HandleIncomingPubRelPacketAsync(MqttPubRelPacket pubRelPacket, CancellationToken cancellationToken)
+        {
+            var pubCompPacket = new MqttPubCompPacket
+            {
+                PacketIdentifier = pubRelPacket.PacketIdentifier,
+                ReasonCode = MqttPubCompReasonCode.Success
+            };
+
+            return SendAsync(pubCompPacket, cancellationToken);
+        }
+
         async Task HandleIncomingSubscribePacketAsync(MqttSubscribePacket subscribePacket, CancellationToken cancellationToken)
         {
             var subscribeResult = await Session.SubscriptionsManager.SubscribeAsync(subscribePacket, ConnectPacket).ConfigureAwait(false);