Ignoring OperationCanceledException when pump is stopping.

Azure · Oct 25, 2019 · 008bb2b · 008bb2b
1 parent 00b1bc6
commit 008bb2b
Showing 1 changed file with 10 additions and 6 deletions.
diff --git a/sdk/servicebus/Microsoft.Azure.ServiceBus/src/MessageReceivePump.cs b/sdk/servicebus/Microsoft.Azure.ServiceBus/src/MessageReceivePump.cs
@@ -108,14 +108,18 @@ async Task MessagePumpTaskAsync()
                         }
                     });
                 }
+                catch (OperationCanceledException) when (pumpCancellationToken.IsCancellationRequested)
+                {
+                    // Ignore as we are stopping the pump
+                }
+                catch (ObjectDisposedException) when (pumpCancellationToken.IsCancellationRequested)
+                {
+                    // Ignore as we are stopping the pump
+                }
                 catch (Exception exception)
                 {
-                    // Not reporting an ObjectDisposedException as we're stopping the pump
-                    if (!(exception is ObjectDisposedException && this.pumpCancellationToken.IsCancellationRequested))
-                    {
-                        MessagingEventSource.Log.MessageReceivePumpTaskException(this.messageReceiver.ClientId, string.Empty, exception);
-                        await this.RaiseExceptionReceived(exception, ExceptionReceivedEventArgsAction.Receive).ConfigureAwait(false);
-                    }
+                    MessagingEventSource.Log.MessageReceivePumpTaskException(this.messageReceiver.ClientId, string.Empty, exception);
+                    await this.RaiseExceptionReceived(exception, ExceptionReceivedEventArgsAction.Receive).ConfigureAwait(false);
                 }
             }
         }