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

Call into the IActionResultFactory only if the return value isn't IActionResult.

This commit is contained in:
David Fowler 2013-12-14 15:58:06 -08:00
parent e87e819b14
commit 81a4cfbfbf
2 changed files with 2 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
Microsoft.AspNet.Mvc/ActionResultFactory.cs
View File

@ -7,13 +7,6 @@ namespace Microsoft.AspNet.Mvc
{ {
public IActionResult CreateActionResult(object actionReturnValue) public IActionResult CreateActionResult(object actionReturnValue)
{ {
var actionResult = actionReturnValue as IActionResult;
if (actionResult != null)
{
return actionResult;
}
var responseMessage = actionReturnValue as HttpResponseMessage; var responseMessage = actionReturnValue as HttpResponseMessage;
if (responseMessage != null) if (responseMessage != null)
{ {

3
Microsoft.AspNet.Mvc/ControllerActionInvoker.cs
View File

@ -47,7 +47,8 @@ namespace Microsoft.AspNet.Mvc
object actionReturnValue = method.Invoke(controller, null); object actionReturnValue = method.Invoke(controller, null);
IActionResult actionResult = _actionResultFactory.CreateActionResult(actionReturnValue); // If it's not already an IActionResult then call into the factory
var actionResult = actionReturnValue as IActionResult ?? _actionResultFactory.CreateActionResult(actionReturnValue);
return actionResult.ExecuteResultAsync(_requestContext); return actionResult.ExecuteResultAsync(_requestContext);
} }