From 5849ba85442ca3a83d2c6fdf2befbf4487d68a89 Mon Sep 17 00:00:00 2001
From: Yishai Galatzer <yigalatz@microsoft.com>
Date: Thu, 13 Mar 2014 18:15:24 -0700
Subject: [PATCH] Cleanup after refactoring

---
 .../Filters/DefaultFilterProvider.cs                | 13 +++++--------
 .../Filters/FilterProviderContext.cs                |  2 ++
 .../ReflectedActionInvoker.cs                       |  2 +-
 3 files changed, 8 insertions(+), 9 deletions(-)

diff --git a/src/Microsoft.AspNet.Mvc.Core/Filters/DefaultFilterProvider.cs b/src/Microsoft.AspNet.Mvc.Core/Filters/DefaultFilterProvider.cs
index a2169ae0f9..86dae8b665 100644
--- a/src/Microsoft.AspNet.Mvc.Core/Filters/DefaultFilterProvider.cs
+++ b/src/Microsoft.AspNet.Mvc.Core/Filters/DefaultFilterProvider.cs
@@ -22,9 +22,6 @@ namespace Microsoft.AspNet.Mvc.Filters
         {
             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)
                 {
                     ProvideFilter(context, item);
@@ -39,14 +36,14 @@ namespace Microsoft.AspNet.Mvc.Filters
 
         public virtual void ProvideFilter(FilterProviderContext context, FilterProviderContext.FilterItem filterItem)
         {
-            var filter = filterItem.Filter;
-
-            if (filter != null)
+            if (filterItem.Filter != null)
             {
                 return;
             }
 
-            var serviceFilterSignature = filterItem.Descriptor.Filter as IServiceFilter;
+            var filter = filterItem.Descriptor.Filter;
+
+            var serviceFilterSignature = filter as IServiceFilter;
             if (serviceFilterSignature != null)
             {
                 var serviceFilter = ServiceProvider.GetService(serviceFilterSignature.ServiceType) as IFilter;
@@ -60,7 +57,7 @@ namespace Microsoft.AspNet.Mvc.Filters
             }
             else
             {
-                var typeFilterSignature = filterItem.Descriptor.Filter as ITypeFilter;
+                var typeFilterSignature = filter as ITypeFilter;
                 if (typeFilterSignature != null)
                 {
                     if (typeFilterSignature.ImplementationType == null)
diff --git a/src/Microsoft.AspNet.Mvc.Core/Filters/FilterProviderContext.cs b/src/Microsoft.AspNet.Mvc.Core/Filters/FilterProviderContext.cs
index 6319ac6297..71aea78ca2 100644
--- a/src/Microsoft.AspNet.Mvc.Core/Filters/FilterProviderContext.cs
+++ b/src/Microsoft.AspNet.Mvc.Core/Filters/FilterProviderContext.cs
@@ -1,4 +1,5 @@
 using System.Collections.Generic;
+using System.Diagnostics;
 
 namespace Microsoft.AspNet.Mvc
 {
@@ -16,6 +17,7 @@ namespace Microsoft.AspNet.Mvc
         // Result
         public List<FilterItem> Items { get; set; }
 
+        [DebuggerDisplay("FilterItem: {Filter}")]
         public class FilterItem
         {
             public FilterItem([NotNull] FilterDescriptor descriptor)
diff --git a/src/Microsoft.AspNet.Mvc.Core/ReflectedActionInvoker.cs b/src/Microsoft.AspNet.Mvc.Core/ReflectedActionInvoker.cs
index 54a118ceb5..ba0686455a 100644
--- a/src/Microsoft.AspNet.Mvc.Core/ReflectedActionInvoker.cs
+++ b/src/Microsoft.AspNet.Mvc.Core/ReflectedActionInvoker.cs
@@ -167,7 +167,7 @@ namespace Microsoft.AspNet.Mvc
 
             foreach (var filter in context.Items)
             {
-                PlaceFilter(filter);
+                PlaceFilter(filter.Filter);
             }
         }