Merge pull request #107 from xcomponent/FixDispose

Prevent Dispose from throwing Exceptions
xcomponent · Jun 19, 2019 · 0f3f1a5 · 0f3f1a5
2 parents 6b5c4f0 + 71c3c0c
commit 0f3f1a5
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 5 deletions.
diff --git a/ReactiveXComponent/RabbitMq/RabbitMqSubscriber.cs b/ReactiveXComponent/RabbitMq/RabbitMqSubscriber.cs
@@ -298,12 +298,19 @@ private void Dispose(bool disposing)
                     // clear managed resources
                     foreach (var subscriberInfo in _subscribersDico.Values)
                     {
-                        if (subscriberInfo.Channel.IsOpen)
+                        try
                         {
                             subscriberInfo.Channel.ModelShutdown -= ChannelOnModelShutdown;
-                            subscriberInfo.Channel.BasicCancel(subscriberInfo.Subscriber.ConsumerTag);
+                            if (subscriberInfo.Channel.IsOpen)
+                            {
+                                subscriberInfo.Channel.BasicCancel(subscriberInfo.Subscriber.ConsumerTag);
+                            }
                         }
-
+                        catch (Exception)
+                        {
+                            // Don't throw exception in Dispose
+                        }
+
                         subscriberInfo.Channel.Dispose();
 
                         foreach (var handler in subscriberInfo.Handlers)

diff --git a/ReactiveXComponent/WebSocket/WebSocketClient.cs b/ReactiveXComponent/WebSocket/WebSocketClient.cs
@@ -151,8 +151,8 @@ private void Dispose(bool disposing)
                     _webSocket.Error -= WebSocketOnError;
                     _webSocket.MessageReceived -= WebSocketOnMessageReceived;
 
-                    _socketOpenEvent.Dispose();
-                    _socketCloseEvent.Dispose();
+                    _socketOpenEvent?.Dispose();
+                    _socketCloseEvent?.Dispose();
                 }
 
                 // clear unmanaged resources