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

Cleanup after refactoring

This commit is contained in:
Yishai Galatzer 2014-03-13 18:15:24 -07:00
parent c4481cf390
commit 5849ba8544
3 changed files with 8 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
src/Microsoft.AspNet.Mvc.Core/Filters/DefaultFilterProvider.cs
View File

@ -22,9 +22,6 @@ namespace Microsoft.AspNet.Mvc.Filters
{ {
if (context.ActionDescriptor.FilterDescriptors != null) if (context.ActionDescriptor.FilterDescriptors != null)
{ {
// make a copy of the list, TODO: Make the actiondescriptor immutable
var filterDescriptors = context.ActionDescriptor.FilterDescriptors.ToArray();
foreach (var item in context.Items) foreach (var item in context.Items)
{ {
ProvideFilter(context, item); ProvideFilter(context, item);
@ -39,14 +36,14 @@ namespace Microsoft.AspNet.Mvc.Filters
public virtual void ProvideFilter(FilterProviderContext context, FilterProviderContext.FilterItem filterItem) public virtual void ProvideFilter(FilterProviderContext context, FilterProviderContext.FilterItem filterItem)
{ {
var filter = filterItem.Filter; if (filterItem.Filter != null)
if (filter != null)
{ {
return; return;
} }
var serviceFilterSignature = filterItem.Descriptor.Filter as IServiceFilter; var filter = filterItem.Descriptor.Filter;
var serviceFilterSignature = filter as IServiceFilter;
if (serviceFilterSignature != null) if (serviceFilterSignature != null)
{ {
var serviceFilter = ServiceProvider.GetService(serviceFilterSignature.ServiceType) as IFilter; var serviceFilter = ServiceProvider.GetService(serviceFilterSignature.ServiceType) as IFilter;
@ -60,7 +57,7 @@ namespace Microsoft.AspNet.Mvc.Filters
} }
else else
{ {
var typeFilterSignature = filterItem.Descriptor.Filter as ITypeFilter; var typeFilterSignature = filter as ITypeFilter;
if (typeFilterSignature != null) if (typeFilterSignature != null)
{ {
if (typeFilterSignature.ImplementationType == null) if (typeFilterSignature.ImplementationType == null)

2
src/Microsoft.AspNet.Mvc.Core/Filters/FilterProviderContext.cs
View File

@ -1,4 +1,5 @@
using System.Collections.Generic; using System.Collections.Generic;
using System.Diagnostics;
namespace Microsoft.AspNet.Mvc namespace Microsoft.AspNet.Mvc
{ {
@ -16,6 +17,7 @@ namespace Microsoft.AspNet.Mvc
// Result // Result
public List<FilterItem> Items { get; set; } public List<FilterItem> Items { get; set; }
[DebuggerDisplay("FilterItem: {Filter}")]
public class FilterItem public class FilterItem
{ {
public FilterItem([NotNull] FilterDescriptor descriptor) public FilterItem([NotNull] FilterDescriptor descriptor)

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

@ -167,7 +167,7 @@ namespace Microsoft.AspNet.Mvc
foreach (var filter in context.Items) foreach (var filter in context.Items)
{ {
PlaceFilter(filter); PlaceFilter(filter.Filter);
} }
} }