CatchScheduler.CatchSchedulerLongRunning: Avoid closure allocation an…

…d allow delegate caching.
dotnet · May 28, 2018 · 47ef6fc · 47ef6fc
1 parent 0c8e295
commit 47ef6fc
Showing 1 changed file with 11 additions and 9 deletions.
diff --git a/Rx.NET/Source/src/System.Reactive/Concurrency/CatchScheduler.cs b/Rx.NET/Source/src/System.Reactive/Concurrency/CatchScheduler.cs
@@ -76,16 +76,18 @@ public CatchSchedulerLongRunning(ISchedulerLongRunning scheduler, Func<TExceptio
 
             public IDisposable ScheduleLongRunning<TState>(TState state, Action<TState, ICancelable> action)
             {
-                return _scheduler.ScheduleLongRunning(state, (state_, cancel) =>
-                {
-                    try
-                    {
-                        action(state_, cancel);
-                    }
-                    catch (TException exception) when (_handler(exception))
+                return _scheduler.ScheduleLongRunning(
+                    (scheduler: this, action, state), 
+                    (tuple, cancel) =>
                     {
-                    }
-                });
+                        try
+                        {
+                            tuple.action(tuple.state, cancel);
+                        }
+                        catch (TException exception) when (tuple.scheduler._handler(exception))
+                        {
+                        }
+                    });
             }
         }