Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 9 additions & 3 deletions src/Polly/CircuitBreaker/CircuitBreakerPolicy.cs
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,6 @@
/// <summary>
/// A circuit-breaker policy that can be applied to delegates.
/// </summary>
#pragma warning disable CA1062 // Validate arguments of public methods
public class CircuitBreakerPolicy : Policy, ICircuitBreakerPolicy
{
internal readonly ICircuitController<EmptyStruct> BreakerController;
Expand Down Expand Up @@ -98,12 +97,19 @@ public void Reset() =>

/// <inheritdoc/>
[DebuggerStepThrough]
protected override TResult Implementation(Func<Context, CancellationToken, TResult> action, Context context, CancellationToken cancellationToken) =>
CircuitBreakerEngine.Implementation(
protected override TResult Implementation(Func<Context, CancellationToken, TResult> action, Context context, CancellationToken cancellationToken)
{
if (action is null)
{
throw new ArgumentNullException(nameof(action));
}

return CircuitBreakerEngine.Implementation(
action,
context,
ExceptionPredicates,
ResultPredicates,
BreakerController,
cancellationToken);
}
}
37 changes: 37 additions & 0 deletions test/Polly.Specs/CircuitBreaker/CircuitBreakerTResultSpecs.cs
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,43 @@ public class CircuitBreakerTResultSpecs : IDisposable
{
#region Configuration tests

[Fact]
public void Should_throw_when_action_is_null()
{
var flags = BindingFlags.NonPublic | BindingFlags.Instance;
Func<Context, CancellationToken, EmptyStruct> action = null!;
PolicyBuilder<EmptyStruct> policyBuilder = new PolicyBuilder<EmptyStruct>(exception => exception);

var exceptionsAllowedBeforeBreaking = 1;
var durationOfBreak = TimeSpan.Zero;
Action<DelegateResult<EmptyStruct>, CircuitState, TimeSpan, Context> onBreak = null!;
Action<Context> onReset = null!;
Action onHalfOpen = null!;
ICircuitController<EmptyStruct> breakerController = new ConsecutiveCountCircuitController<EmptyStruct>(
exceptionsAllowedBeforeBreaking,
durationOfBreak,
onBreak,
onReset,
onHalfOpen);

var instance = Activator.CreateInstance(
typeof(CircuitBreakerPolicy<EmptyStruct>),
flags,
null,
[policyBuilder, breakerController],
null)!;
var instanceType = instance.GetType();
var methods = instanceType.GetMethods(flags);
var methodInfo = methods.First(method => method is { Name: "Implementation", ReturnType.Name: "EmptyStruct" });

var func = () => methodInfo.Invoke(instance, [action, new Context(), CancellationToken.None]);

var exceptionAssertions = func.Should().Throw<TargetInvocationException>();
exceptionAssertions.And.Message.Should().Be("Exception has been thrown by the target of an invocation.");
exceptionAssertions.And.InnerException.Should().BeOfType<ArgumentNullException>()
.Which.ParamName.Should().Be("action");
}

[Fact]
public void Should_be_able_to_handle_a_duration_of_timespan_maxvalue()
{
Expand Down