Merge pull request #1177 from hez2010/master

clairernovotny · web-flow · commit f867e71bf00e · 2020-04-02T09:38:01.000-04:00
Fix infinite recursive generics in CatchScheduler
diff --git a/Rx.NET/Source/src/System.Reactive/Concurrency/CatchScheduler.cs b/Rx.NET/Source/src/System.Reactive/Concurrency/CatchScheduler.cs
@@ -108,7 +108,8 @@ public PeriodicallyScheduledWorkItem(CatchSchedulerPeriodic scheduler, TState st
                     _catchScheduler = scheduler;
                     _action = action;
 
-                    Disposable.SetSingle(ref _cancel, scheduler._scheduler.SchedulePeriodic((@this: this, state), period, tuple => tuple.@this?.Tick(tuple.state) ?? default));
+                    // Note that avoiding closure allocation here would introduce infinite generic recursion over the TState argument
+                    Disposable.SetSingle(ref _cancel, scheduler._scheduler.SchedulePeriodic(state, period, state1 => this.Tick(state1).state ?? default));
                 }
 
                 public void Dispose()

Original file line number	Diff line number	Diff line change
`@@ -108,7 +108,8 @@ public PeriodicallyScheduledWorkItem(CatchSchedulerPeriodic scheduler, TState st`
`108`	`108`	`_catchScheduler = scheduler;`
`109`	`109`	`_action = action;`
`110`	`110`
`111`		`- Disposable.SetSingle(ref _cancel, scheduler._scheduler.SchedulePeriodic((@this: this, state), period, tuple => tuple.@this?.Tick(tuple.state) ?? default));`
	`111`	`+ // Note that avoiding closure allocation here would introduce infinite generic recursion over the TState argument`
	`112`	`+ Disposable.SetSingle(ref _cancel, scheduler._scheduler.SchedulePeriodic(state, period, state1 => this.Tick(state1).state ?? default));`
`112`	`113`	`}`
`113`	`114`
`114`	`115`	`public void Dispose()`