From 841a22b2b2c387475643b747e0c34489d3046dc2 Mon Sep 17 00:00:00 2001
From: Christian Kratky <christian.kratky@googlemail.com>
Date: Wed, 6 Jun 2018 22:08:46 +0200
Subject: [PATCH] Refactor channel adapter.

---
 .../Adapter/MqttChannelAdapter.cs             | 43 +++++++------------
 1 file changed, 15 insertions(+), 28 deletions(-)

diff --git a/Frameworks/MQTTnet.NetStandard/Adapter/MqttChannelAdapter.cs b/Frameworks/MQTTnet.NetStandard/Adapter/MqttChannelAdapter.cs
index 218fcb93..49c04e84 100644
--- a/Frameworks/MQTTnet.NetStandard/Adapter/MqttChannelAdapter.cs
+++ b/Frameworks/MQTTnet.NetStandard/Adapter/MqttChannelAdapter.cs
@@ -177,34 +177,17 @@ namespace MQTTnet.Adapter
             {
                 await action().ConfigureAwait(false);
             }
-            catch (TaskCanceledException)
+            catch (Exception exception)
             {
-                throw;
-            }
-            catch (OperationCanceledException)
-            {
-                throw;
-            }
-            catch (MqttCommunicationTimedOutException)
-            {
-                throw;
-            }
-            catch (MqttCommunicationException)
-            {
-                throw;
-            }
-            catch (COMException comException)
-            {
-                if ((uint)comException.HResult == ErrorOperationAborted)
+                if (exception is TaskCanceledException ||
+                    exception is OperationCanceledException ||
+                    exception is MqttCommunicationTimedOutException ||
+                    exception is MqttCommunicationException)
                 {
-                    throw new OperationCanceledException();
+                    throw;
                 }
 
-                throw new MqttCommunicationException(comException);
-            }
-            catch (IOException exception)
-            {
-                if (exception.InnerException is SocketException socketException)
+                if (exception is IOException && exception.InnerException is SocketException socketException)
                 {
                     if (socketException.SocketErrorCode == SocketError.ConnectionAborted)
                     {
@@ -212,10 +195,14 @@ namespace MQTTnet.Adapter
                     }
                 }
 
-                throw new MqttCommunicationException(exception);
-            }
-            catch (Exception exception)
-            {
+                if (exception is COMException comException)
+                {
+                    if ((uint)comException.HResult == ErrorOperationAborted)
+                    {
+                        throw new OperationCanceledException();
+                    }
+                }
+
                 throw new MqttCommunicationException(exception);
             }
         }