Fix Validator concurrency issue

* Fixes App-vNext#2412
kmcclellan · Dec 31, 2024 · 37071b2 · 37071b2
1 parent 3b6f7c6
commit 37071b2
Showing 1 changed file with 11 additions and 1 deletion.
diff --git a/src/Polly.Core/ResiliencePipelineBuilderBase.cs b/src/Polly.Core/ResiliencePipelineBuilderBase.cs
@@ -18,6 +18,9 @@ namespace Polly;
 public abstract class ResiliencePipelineBuilderBase
 #pragma warning restore S1694 // An abstract class should have both abstract and concrete methods
 {
+    // Workaround for https://github.com/dotnet/runtime/issues/110917
+    private static readonly object ValidatorLock = new();
+
     private readonly List<Entry> _entries = [];
     private bool _used;
 
@@ -105,7 +108,14 @@ internal void AddPipelineComponent(Func<StrategyBuilderContext, PipelineComponen
         Guard.NotNull(factory);
         Guard.NotNull(options);
 
-        Validator(new ResilienceValidationContext(options, $"The '{TypeNameFormatter.Format(options.GetType())}' are invalid."));
+        var validationContext = new ResilienceValidationContext(
+            options,
+            $"The '{TypeNameFormatter.Format(options.GetType())}' are invalid.");
+
+        lock (ValidatorLock)
+        {
+            Validator(validationContext);
+        }
 
         if (_used)
         {