Fix AsyncLocal in Framework.

timcassell · Nov 6, 2023 · 966b309 · 966b309
1 parent 7b53797
commit 966b309
Showing 1 changed file with 6 additions and 2 deletions.
diff --git a/Package/Core/Promises/Internal/ParallelInternal.cs b/Package/Core/Promises/Internal/ParallelInternal.cs
@@ -303,7 +303,9 @@ private void ExecuteWorkerAndLaunchNext()
                     }
                     else
                     {
-                        ExecutionContext.Run(_executionContext, obj => obj.UnsafeAs<PromiseParallelForEach<TEnumerator, TParallelBody, TSource>>().ExecuteWorker(true), this);
+                        // .Net Framework doesn't allow us to re-use a captured context, so we have to copy it for each invocation.
+                        // .Net Core's implementation of CreateCopy returns itself, so this is always as efficient as it can be.
+                        ExecutionContext.Run(_executionContext.CreateCopy(), obj => obj.UnsafeAs<PromiseParallelForEach<TEnumerator, TParallelBody, TSource>>().ExecuteWorker(true), this);
                     }
                 }
 
@@ -315,7 +317,9 @@ private void ExecuteWorkerWithoutLaunchNext()
                     }
                     else
                     {
-                        ExecutionContext.Run(_executionContext, obj => obj.UnsafeAs<PromiseParallelForEach<TEnumerator, TParallelBody, TSource>>().ExecuteWorker(false), this);
+                        // .Net Framework doesn't allow us to re-use a captured context, so we have to copy it for each invocation.
+                        // .Net Core's implementation of CreateCopy returns itself, so this is always as efficient as it can be.
+                        ExecutionContext.Run(_executionContext.CreateCopy(), obj => obj.UnsafeAs<PromiseParallelForEach<TEnumerator, TParallelBody, TSource>>().ExecuteWorker(false), this);
                     }
                 }