Fixing an issue where only setting timeout value in QoS would result …

…in a exception getting thrown. Issue ThreeMammals#908
DanHarltey · Aug 2, 2023 · 673b5e1 · 673b5e1
1 parent 433dfca
commit 673b5e1
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 4 deletions.
diff --git a/src/Ocelot.Provider.Polly/PollyCircuitBreakingDelegatingHandler.cs b/src/Ocelot.Provider.Polly/PollyCircuitBreakingDelegatingHandler.cs
@@ -26,9 +26,18 @@ protected override async Task<HttpResponseMessage> SendAsync(HttpRequestMessage
         {
             try
             {
-                return await Policy
-                    .WrapAsync(_qoSProvider.CircuitBreaker.Policies)
-                    .ExecuteAsync(() => base.SendAsync(request, cancellationToken));
+                IAsyncPolicy policy;
+
+                if (_qoSProvider.CircuitBreaker.Policies.Length == 1)
+                {
+                    policy = _qoSProvider.CircuitBreaker.Policies[0];
+                }
+                else
+                {
+                    policy = Policy.WrapAsync(_qoSProvider.CircuitBreaker.Policies);
+                }
+
+                return await policy.ExecuteAsync(() => base.SendAsync(request, cancellationToken));
             }
             catch (BrokenCircuitException ex)
             {

diff --git a/test/Ocelot.AcceptanceTests/PollyQoSTests.cs b/test/Ocelot.AcceptanceTests/PollyQoSTests.cs
@@ -93,7 +93,6 @@ public void should_timeout()
                         QoSOptions = new FileQoSOptions
                         {
                             TimeoutValue = 10,
-                            ExceptionsAllowedBeforeBreaking = 10,
                         },
                     },
                 },