Lazy create ResourceInvoker.InvokeAlwaysRunResultFilters statemachine

xutsing · Apr 15, 2019 · 0657a3e · 0657a3e
1 parent 6039699
commit 0657a3e
Showing 1 changed file with 32 additions and 7 deletions.
diff --git a/src/Mvc/Mvc.Core/src/Infrastructure/ResourceInvoker.cs b/src/Mvc/Mvc.Core/src/Infrastructure/ResourceInvoker.cs
@@ -1011,16 +1011,41 @@ static async Task Awaited(ResourceInvoker invoker, Task lastTask, State next, Sc
             }
         }
 
-        private async Task InvokeAlwaysRunResultFilters()
+        private Task InvokeAlwaysRunResultFilters()
         {
-            var next = State.ResultBegin;
-            var scope = Scope.Invoker;
-            var state = (object)null;
-            var isCompleted = false;
+            try
+            {
+                var next = State.ResultBegin;
+                var scope = Scope.Invoker;
+                var state = (object)null;
+                var isCompleted = false;
 
-            while (!isCompleted)
+                while (!isCompleted)
+                {
+                    var lastTask = ResultNext<IAlwaysRunResultFilter, IAsyncAlwaysRunResultFilter>(ref next, ref scope, ref state, ref isCompleted);
+                    if (!lastTask.IsCompletedSuccessfully)
+                    {
+                        return Awaited(this, lastTask, next, scope, state, isCompleted);
+                    }
+                }
+
+                return Task.CompletedTask;
+            }
+            catch (Exception ex)
+            {
+                // Wrap non task-wrapped exceptions in a Task, 
+                // as this isn't done automatically since the method is not async.
+                return Task.FromException(ex);
+            }
+
+            static async Task Awaited(ResourceInvoker invoker, Task lastTask, State next, Scope scope, object state, bool isCompleted)
             {
-                await ResultNext<IAlwaysRunResultFilter, IAsyncAlwaysRunResultFilter>(ref next, ref scope, ref state, ref isCompleted);
+                await lastTask;
+
+                while (!isCompleted)
+                {
+                    await invoker.ResultNext<IAlwaysRunResultFilter, IAsyncAlwaysRunResultFilter>(ref next, ref scope, ref state, ref isCompleted);
+                }
             }
         }