Merge pull request #1116 from jkotas/generic-recursion

Avoid infinite generics recursion in SynchronizationContextScheduler
dotnet · Dec 24, 2019 · 03aa3ed · 03aa3ed
2 parents c7c3b59 + 3cebafa
commit 03aa3ed
Showing 1 changed file with 2 additions and 1 deletion.
diff --git a/Rx.NET/Source/src/System.Reactive/Concurrency/SynchronizationContextScheduler.cs b/Rx.NET/Source/src/System.Reactive/Concurrency/SynchronizationContextScheduler.cs
@@ -93,7 +93,8 @@ public override IDisposable Schedule<TState>(TState state, TimeSpan dueTime, Fun
                 return Schedule(state, action);
             }
 
-            return DefaultScheduler.Instance.Schedule((scheduler: this, action, state), dt, (_, tuple) => tuple.scheduler.Schedule(tuple.state, tuple.action));
+            // Note that avoiding closure allocation here would introduce infinite generic recursion over the TState argument
+            return DefaultScheduler.Instance.Schedule(state, dt, (_, state1) => Schedule(state1, action));
         }
     }
 }