diff --git a/src/Microsoft.AspNet.Mvc.Core/Properties/Resources.Designer.cs b/src/Microsoft.AspNet.Mvc.Core/Properties/Resources.Designer.cs index 90da94d467..1369df543c 100644 --- a/src/Microsoft.AspNet.Mvc.Core/Properties/Resources.Designer.cs +++ b/src/Microsoft.AspNet.Mvc.Core/Properties/Resources.Designer.cs @@ -619,7 +619,7 @@ namespace Microsoft.AspNet.Mvc.Core } /// - /// 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}. /// internal static string AsyncActionFilter_InvalidShortCircuit { @@ -627,7 +627,7 @@ namespace Microsoft.AspNet.Mvc.Core } /// - /// 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}. /// internal static string FormatAsyncActionFilter_InvalidShortCircuit(object p0, object p1, object p2, object p3) { @@ -635,7 +635,7 @@ namespace Microsoft.AspNet.Mvc.Core } /// - /// 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}. /// internal static string AsyncResultFilter_InvalidShortCircuit { @@ -643,7 +643,7 @@ namespace Microsoft.AspNet.Mvc.Core } /// - /// 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}. /// internal static string FormatAsyncResultFilter_InvalidShortCircuit(object p0, object p1, object p2, object p3) { diff --git a/src/Microsoft.AspNet.Mvc.Core/ReflectedActionInvoker.cs b/src/Microsoft.AspNet.Mvc.Core/ReflectedActionInvoker.cs index 98ed5318af..a602506e05 100644 --- a/src/Microsoft.AspNet.Mvc.Core/ReflectedActionInvoker.cs +++ b/src/Microsoft.AspNet.Mvc.Core/ReflectedActionInvoker.cs @@ -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) }; } diff --git a/src/Microsoft.AspNet.Mvc.Core/Resources.resx b/src/Microsoft.AspNet.Mvc.Core/Resources.resx index 5a44abefac..e2399bff48 100644 --- a/src/Microsoft.AspNet.Mvc.Core/Resources.resx +++ b/src/Microsoft.AspNet.Mvc.Core/Resources.resx @@ -232,10 +232,10 @@ No route matches the supplied values. - 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}. - 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}. The partial view '{0}' was not found. The following locations were searched:{1} diff --git a/test/Microsoft.AspNet.Mvc.Core.Test/ReflectedActionInvokerTest.cs b/test/Microsoft.AspNet.Mvc.Core.Test/ReflectedActionInvokerTest.cs index 05ab0ccb12..6d634e5ff7 100644 --- a/test/Microsoft.AspNet.Mvc.Core.Test/ReflectedActionInvokerTest.cs +++ b/test/Microsoft.AspNet.Mvc.Core.Test/ReflectedActionInvokerTest.cs @@ -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);