huahaofeng
/
aspnetcore
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Feedback

This commit is contained in:
Ben Adams 2019-04-13 01:40:16 +01:00 committed by Ryan Nowak
parent 70b02f8406
commit 1baeaaac36
1 changed files with 6 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
src/Mvc/Mvc.Core/src/Infrastructure/ResourceInvoker.cs
View File

@ -67,20 +67,14 @@ namespace Microsoft.AspNetCore.Mvc.Infrastructure
_actionContextAccessor.ActionContext = _actionContext; _actionContextAccessor.ActionContext = _actionContext;
var scope = _logger.ActionScope(_actionContext.ActionDescriptor); var scope = _logger.ActionScope(_actionContext.ActionDescriptor);
Exception invokeException = null;
Task task = null; Task task = null;
try try
{ {
task = InvokeFilterPipelineAsync(); task = InvokeFilterPipelineAsync();
} }
catch (Exception ex) catch (Exception exception)
{ {
invokeException = ex; return Awaited(this, Task.FromException(exception), scope);
}
if (invokeException != null)
{
return Awaited(this, Task.FromException(invokeException), scope);
} }
Debug.Assert(task != null); Debug.Assert(task != null);
@ -94,9 +88,9 @@ namespace Microsoft.AspNetCore.Mvc.Infrastructure
{ {
ReleaseResources(); ReleaseResources();
} }
catch (Exception ex) catch (Exception exception)
{ {
releaseException = ex; releaseException = exception;
} }
Exception scopeException = null; Exception scopeException = null;
@ -104,9 +98,9 @@ namespace Microsoft.AspNetCore.Mvc.Infrastructure
{ {
scope.Dispose(); scope.Dispose();
} }
catch (Exception ex) catch (Exception exception)
{ {
scopeException = ex; scopeException = exception;
} }
if (releaseException == null && scopeException == null) if (releaseException == null && scopeException == null)