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

CR feedback for filters

This commit is contained in:
Ryan Nowak 2014-04-18 18:09:45 -07:00
parent b8731621df
commit 73670fb5d7
4 changed files with 8 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/Microsoft.AspNet.Mvc.Core/Properties/Resources.Designer.cs generated
View File

@ -619,7 +619,7 @@ namespace Microsoft.AspNet.Mvc.Core
}
/// <summary>
/// If an {0} provides a result value by setting the {1} property of {2} to a non-null value, then the it should not call the next filter by invoking {3}.
/// If an {0} provides a result value by setting the {1} property of {2} to a non-null value, then it cannot call the next filter by invoking {3}.
/// </summary>
internal static string AsyncActionFilter_InvalidShortCircuit
{
@ -627,7 +627,7 @@ namespace Microsoft.AspNet.Mvc.Core
}
/// <summary>
/// If an {0} provides a result value by setting the {1} property of {2} to a non-null value, then the it should not call the next filter by invoking {3}.
/// If an {0} provides a result value by setting the {1} property of {2} to a non-null value, then it cannot call the next filter by invoking {3}.
/// </summary>
internal static string FormatAsyncActionFilter_InvalidShortCircuit(object p0, object p1, object p2, object p3)
{
@ -635,7 +635,7 @@ namespace Microsoft.AspNet.Mvc.Core
}
/// <summary>
/// If an {0} cancels execution by setting the {1} property of {2} to 'true', then the it should not call the next filter by invoking {3}.
/// If an {0} cancels execution by setting the {1} property of {2} to 'true', then it cannot call the next filter by invoking {3}.
/// </summary>
internal static string AsyncResultFilter_InvalidShortCircuit
{
@ -643,7 +643,7 @@ namespace Microsoft.AspNet.Mvc.Core
}
/// <summary>
/// If an {0} cancels execution by setting the {1} property of {2} to 'true', then the it should not call the next filter by invoking {3}.
/// If an {0} cancels execution by setting the {1} property of {2} to 'true', then it cannot call the next filter by invoking {3}.
/// </summary>
internal static string FormatAsyncResultFilter_InvalidShortCircuit(object p0, object p1, object p2, object p3)
{

2
src/Microsoft.AspNet.Mvc.Core/ReflectedActionInvoker.cs
View File

@ -350,7 +350,6 @@ namespace Microsoft.AspNet.Mvc
// Exceptions thrown by the action method OR filters bubble back up through ActionExcecutedContext.
_actionExecutedContext = new ActionExecutedContext(_actionExecutingContext, _filters)
{
Exception = exception,
ExceptionDispatchInfo = ExceptionDispatchInfo.Capture(exception)
};
}
@ -467,7 +466,6 @@ namespace Microsoft.AspNet.Mvc
{
_resultExecutedContext = new ResultExecutedContext(_resultExecutingContext, _filters, _resultExecutingContext.Result)
{
Exception = exception,
ExceptionDispatchInfo = ExceptionDispatchInfo.Capture(exception)
};
}

4
src/Microsoft.AspNet.Mvc.Core/Resources.resx
View File

@ -232,10 +232,10 @@
<value>No route matches the supplied values.</value>
</data>
<data name="AsyncActionFilter_InvalidShortCircuit" xml:space="preserve">
<value>If an {0} provides a result value by setting the {1} property of {2} to a non-null value, then the it should not call the next filter by invoking {3}.</value>
<value>If an {0} provides a result value by setting the {1} property of {2} to a non-null value, then it cannot call the next filter by invoking {3}.</value>
</data>
<data name="AsyncResultFilter_InvalidShortCircuit" xml:space="preserve">
<value>If an {0} cancels execution by setting the {1} property of {2} to 'true', then the it should not call the next filter by invoking {3}.</value>
<value>If an {0} cancels execution by setting the {1} property of {2} to 'true', then it cannot call the next filter by invoking {3}.</value>
</data>
<data name="ViewEngine_PartialViewNotFound" xml:space="preserve">
<value>The partial view '{0}' was not found. The following locations were searched:{1}</value>

4
test/Microsoft.AspNet.Mvc.Core.Test/ReflectedActionInvokerTest.cs
View File

@ -623,7 +623,7 @@ namespace Microsoft.AspNet.Mvc
var message =
"If an IAsyncActionFilter provides a result value by setting the Result property of " +
"ActionExecutingContext to a non-null value, then the it should not call the next filter by invoking " +
"ActionExecutingContext to a non-null value, then it cannot call the next filter by invoking " +
"ActionExecutionDelegate.";
var invoker = CreateInvoker(actionFilter.Object);
@ -972,7 +972,7 @@ namespace Microsoft.AspNet.Mvc
var message =
"If an IAsyncResultFilter cancels execution by setting the Cancel property of " +
"ResultExecutingContext to 'true', then the it should not call the next filter by invoking " +
"ResultExecutingContext to 'true', then it cannot call the next filter by invoking " +
"ResultExecutionDelegate.";
var invoker = CreateInvoker(filter.Object);