Catch 'ObjectDisposedException' in session message pump

Azure · Jul 2, 2019 · 9ec4e42 · 9ec4e42
1 parent e0eeb58
commit 9ec4e42
Showing 1 changed file with 18 additions and 15 deletions.
diff --git a/sdk/servicebus/Microsoft.Azure.ServiceBus/src/SessionReceivePump.cs b/sdk/servicebus/Microsoft.Azure.ServiceBus/src/SessionReceivePump.cs
@@ -54,17 +54,18 @@ public void StartPump()
             }
         }
 
-        static void CancelAndDisposeCancellationTokenSource(CancellationTokenSource renewLockCancellationTokenSource)
-        {
-            renewLockCancellationTokenSource?.Cancel();
-            renewLockCancellationTokenSource?.Dispose();
-        }
-
-        static void OnUserCallBackTimeout(object state)
+        static void CancelAutoRenewLock(object state)
         {
             var renewCancellationTokenSource = (CancellationTokenSource)state;
-            renewCancellationTokenSource?.Cancel();
-            renewCancellationTokenSource?.Dispose();
+
+            try
+            {
+                renewCancellationTokenSource.Cancel();
+            }
+            catch (ObjectDisposedException)
+            {
+                // Ignore this race.
+            }
         }
 
         bool ShouldRenewSessionLock()
@@ -179,8 +180,8 @@ async Task MessagePumpTaskAsync(IMessageSession session)
                 TaskExtensionHelper.Schedule(() => this.RenewSessionLockTaskAsync(session, renewLockCancellationTokenSource.Token));
             }
 
-            var userCallbackTimer = new Timer(
-                OnUserCallBackTimeout,
+            var autoRenewLockCancellationTimer = new Timer(
+                CancelAutoRenewLock,
                 renewLockCancellationTokenSource,
                 Timeout.Infinite,
                 Timeout.Infinite);
@@ -223,7 +224,7 @@ async Task MessagePumpTaskAsync(IMessageSession session)
                     try
                     {
                         // Set the timer
-                        userCallbackTimer.Change(this.sessionHandlerOptions.MaxAutoRenewDuration,
+                        autoRenewLockCancellationTimer.Change(this.sessionHandlerOptions.MaxAutoRenewDuration,
                             TimeSpan.FromMilliseconds(-1));
                         var callbackExceptionOccurred = false;
                         try
@@ -248,7 +249,7 @@ async Task MessagePumpTaskAsync(IMessageSession session)
                         }
                         finally
                         {
-                            userCallbackTimer.Change(Timeout.Infinite, Timeout.Infinite);
+                            autoRenewLockCancellationTimer.Change(Timeout.Infinite, Timeout.Infinite);
                         }
 
                         if (!callbackExceptionOccurred)
@@ -269,8 +270,10 @@ async Task MessagePumpTaskAsync(IMessageSession session)
             }
             finally
             {
-                userCallbackTimer.Dispose();
-                CancelAndDisposeCancellationTokenSource(renewLockCancellationTokenSource);
+                renewLockCancellationTokenSource.Cancel();
+                renewLockCancellationTokenSource.Dispose();
+                autoRenewLockCancellationTimer.Dispose();
+
                 await this.CloseSessionIfNeededAsync(session).ConfigureAwait(false);
                 this.maxConcurrentSessionsSemaphoreSlim.Release();
             }