Merge pull request #81 from richardschneider/cancel-udp

ignore receive error. Fixes #79
richardschneider · Oct 5, 2019 · d16cff2 · d16cff2
2 parents 597bc97 + 94e3416
commit d16cff2
Showing 1 changed file with 22 additions and 2 deletions.
diff --git a/src/MulticastClient.cs b/src/MulticastClient.cs
@@ -161,6 +161,8 @@ await sender.Value.SendAsync(
 
         void Listen(UdpClient receiver)
         {
+            // ReceiveAsync does not support cancellation.  So the receiver is disposed
+            // to stop it. See https://github.com/dotnet/corefx/issues/9848
             Task.Run(async () =>
             {
                 try
@@ -173,6 +175,10 @@ void Listen(UdpClient receiver)
 
                     await task.ConfigureAwait(false);
                 }
+                catch (NullReferenceException)
+                {
+                    return;
+                }
                 catch (ObjectDisposedException)
                 {
                     return;
@@ -204,15 +210,29 @@ protected virtual void Dispose(bool disposing)
 
                     foreach (var receiver in receivers)
                     {
-                        receiver.Dispose();
+                        try
+                        {
+                            receiver.Dispose();
+                        }
+                        catch
+                        {
+                            // eat it.
+                        }
                     }
                     receivers.Clear();
 
                     foreach (var address in senders.Keys)
                     {
                         if (senders.TryRemove(address, out var sender))
                         {
-                            sender.Dispose();
+                            try
+                            {
+                                sender.Dispose();
+                            }
+                            catch
+                            {
+                                // eat it.
+                            }
                         }
                     }
                     senders.Clear();