Fix NullReferenceException

ramonsmits · ramonsmits · commit 9777ba99307a · 2025-04-02T15:09:53.000+02:00
diff --git a/src/NServiceBus.Transport.Sql.Shared/Receiving/MessageReceiver.cs b/src/NServiceBus.Transport.Sql.Shared/Receiving/MessageReceiver.cs
@@ -155,17 +155,16 @@ public async Task StopReceive(CancellationToken cancellationToken = default)
             {
                 Dispose();
             }
-
         }
 
         public void Dispose()
         {
-            messageReceivingCircuitBreaker.Dispose();
-            messageProcessingCircuitBreaker.Dispose();
-            concurrencyLimiter.Dispose();
-            messageReceivingCancellationTokenSource.Dispose();
+            messageReceivingCircuitBreaker?.Dispose();
+            messageProcessingCircuitBreaker?.Dispose();
+            concurrencyLimiter?.Dispose();
+            messageReceivingCancellationTokenSource?.Dispose();
             messageReceivingCancellationTokenSource = null;
-            messageProcessingCancellationTokenSource.Dispose();
+            messageProcessingCancellationTokenSource?.Dispose();
         }
 
         async Task ReceiveMessagesAndSwallowExceptions(CancellationToken messageReceivingCancellationToken)

Original file line number	Diff line number	Diff line change
`@@ -155,17 +155,16 @@ public async Task StopReceive(CancellationToken cancellationToken = default)`
`155`	`155`	`{`
`156`	`156`	`Dispose();`
`157`	`157`	`}`
`158`		`-`
`159`	`158`	`}`
`160`	`159`
`161`	`160`	`public void Dispose()`
`162`	`161`	`{`
`163`		`- messageReceivingCircuitBreaker.Dispose();`
`164`		`- messageProcessingCircuitBreaker.Dispose();`
`165`		`- concurrencyLimiter.Dispose();`
`166`		`- messageReceivingCancellationTokenSource.Dispose();`
	`162`	`+ messageReceivingCircuitBreaker?.Dispose();`
	`163`	`+ messageProcessingCircuitBreaker?.Dispose();`
	`164`	`+ concurrencyLimiter?.Dispose();`
	`165`	`+ messageReceivingCancellationTokenSource?.Dispose();`
`167`	`166`	`messageReceivingCancellationTokenSource = null;`
`168`		`- messageProcessingCancellationTokenSource.Dispose();`
	`167`	`+ messageProcessingCancellationTokenSource?.Dispose();`
`169`	`168`	`}`
`170`	`169`
`171`	`170`	`async Task ReceiveMessagesAndSwallowExceptions(CancellationToken messageReceivingCancellationToken)`