Don't use Exception as ExceptionHandled

aspnet · Jun 8, 2016 · d57f2d0 · d57f2d0
1 parent 74e2c04
commit d57f2d0
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 7 deletions.
diff --git a/src/Microsoft.AspNetCore.Mvc.Core/Internal/ControllerActionInvoker.cs b/src/Microsoft.AspNetCore.Mvc.Core/Internal/ControllerActionInvoker.cs
@@ -412,7 +412,7 @@ private async Task InvokeExceptionFilterAsync()
                 await InvokeExceptionFilterAsync();
 
                 Debug.Assert(_exceptionContext != null);
-                if (_exceptionContext.Exception != null)
+                if (_exceptionContext.Exception != null && !_exceptionContext.ExceptionHandled)
                 {
                     _diagnosticSource.BeforeOnExceptionAsync(_exceptionContext, current.FilterAsync);
 
@@ -422,7 +422,7 @@ private async Task InvokeExceptionFilterAsync()
 
                     _diagnosticSource.AfterOnExceptionAsync(_exceptionContext, current.FilterAsync);
 
-                    if (_exceptionContext.Exception == null)
+                    if (_exceptionContext.ExceptionHandled)
                     {
                         _logger.ExceptionFilterShortCircuited(current.FilterAsync);
                     }
@@ -435,7 +435,7 @@ private async Task InvokeExceptionFilterAsync()
                 await InvokeExceptionFilterAsync();
 
                 Debug.Assert(_exceptionContext != null);
-                if (_exceptionContext.Exception != null)
+                if (_exceptionContext.Exception != null && !_exceptionContext.ExceptionHandled)
                 {
                     _diagnosticSource.BeforeOnException(_exceptionContext, current.Filter);
 
@@ -445,7 +445,7 @@ private async Task InvokeExceptionFilterAsync()
 
                     _diagnosticSource.AfterOnException(_exceptionContext, current.Filter);
 
-                    if (_exceptionContext.Exception == null)
+                    if (_exceptionContext.ExceptionHandled)
                     {
                         _logger.ExceptionFilterShortCircuited(current.Filter);
                     }

diff --git a/test/Microsoft.AspNetCore.Mvc.Core.Test/Internal/ControllerActionInvokerTest.cs b/test/Microsoft.AspNetCore.Mvc.Core.Test/Internal/ControllerActionInvokerTest.cs
@@ -155,7 +155,7 @@ public async Task InvokeAction_InvokesExceptionFilter_ShortCircuit()
                 .Callback<ExceptionContext>(context =>
                 {
                     filter2.ToString();
-                    context.Exception = null;
+                    context.ExceptionHandled = true;
                 })
                 .Verifiable();
 
@@ -182,7 +182,7 @@ public async Task InvokeAction_InvokesAsyncExceptionFilter_ShortCircuit()
                 .Callback<ExceptionContext>(context =>
                 {
                     filter2.ToString();
-                    context.Exception = null;
+                    context.ExceptionHandled = true;
                 })
                 .Returns<ExceptionContext>((context) => Task.FromResult(true))
                 .Verifiable();

diff --git a/test/WebSites/FiltersWebSite/Filters/ShortCircuitExceptionFilter.cs b/test/WebSites/FiltersWebSite/Filters/ShortCircuitExceptionFilter.cs
@@ -9,7 +9,7 @@ public class ShortCircuitExceptionFilter : ExceptionFilterAttribute
     {
         public override void OnException(ExceptionContext context)
         {
-            context.Exception = null;
+            context.ExceptionHandled = true;
         }
     }
 }