Merge pull request #512 from microsoft/release/update/250507083627

MattB-msft · web-flow · commit e5c182bff573 · 2025-05-07T20:15:06.000-07:00
Resolve bug in Cancelation Token comparison
diff --git a/src/GeneralTools/DataverseClient/Client/ServiceClient.cs b/src/GeneralTools/DataverseClient/Client/ServiceClient.cs
@@ -1876,7 +1876,7 @@ internal async Task<OrganizationResponse> Command_ExecuteAsyncImpl(OrganizationR
                 catch (Exception ex)
                 {
                     bool isThrottled = false;
-                    retry = ShouldRetry(req, ex, retryCount, out isThrottled) || !cancellationToken.IsCancellationRequested;
+                    retry = ShouldRetry(req, ex, retryCount, out isThrottled) && !cancellationToken.IsCancellationRequested;
                     if (retry)
                     {
                         retryCount = await Utilities.RetryRequest(req, requestTrackingId, LockWait, logDt, _logEntry, SessionTrackingId, _disableConnectionLocking, _retryPauseTimeRunning, ex, errorStringCheck, retryCount, isThrottled, cancellationToken: cancellationToken).ConfigureAwait(false);

Original file line number	Diff line number	Diff line change
`@@ -1876,7 +1876,7 @@ internal async Task<OrganizationResponse> Command_ExecuteAsyncImpl(OrganizationR`
`1876`	`1876`	`catch (Exception ex)`
`1877`	`1877`	`{`
`1878`	`1878`	`bool isThrottled = false;`
`1879`		`- retry = ShouldRetry(req, ex, retryCount, out isThrottled) \|\| !cancellationToken.IsCancellationRequested;`
	`1879`	`+ retry = ShouldRetry(req, ex, retryCount, out isThrottled) && !cancellationToken.IsCancellationRequested;`
`1880`	`1880`	`if (retry)`
`1881`	`1881`	`{`
`1882`	`1882`	`retryCount = await Utilities.RetryRequest(req, requestTrackingId, LockWait, logDt, _logEntry, SessionTrackingId, _disableConnectionLocking, _retryPauseTimeRunning, ex, errorStringCheck, retryCount, isThrottled, cancellationToken: cancellationToken).ConfigureAwait(false);`