From 1f9d4969a7f6264af626ad6811c161ca081a8e21 Mon Sep 17 00:00:00 2001 From: Yishai Galatzer Date: Wed, 12 Feb 2014 09:15:16 -0800 Subject: [PATCH] CR Feedback --- src/Microsoft.AspNet.Mvc/DefaultControllerFactory.cs | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-) diff --git a/src/Microsoft.AspNet.Mvc/DefaultControllerFactory.cs b/src/Microsoft.AspNet.Mvc/DefaultControllerFactory.cs index c284196376..0a2df729d7 100644 --- a/src/Microsoft.AspNet.Mvc/DefaultControllerFactory.cs +++ b/src/Microsoft.AspNet.Mvc/DefaultControllerFactory.cs @@ -34,12 +34,8 @@ namespace Microsoft.AspNet.Mvc var controller = ActivatorUtilities.CreateInstance(_serviceProvider, descriptor.ControllerType); // TODO: How do we feed the controller with context (need DI improvements) - var contextProperty = -#if NET45 - descriptor.ControllerType.GetProperty("Context"); -#else - descriptor.ControllerType.GetRuntimeProperty("Context"); -#endif + var contextProperty = descriptor.ControllerType.GetRuntimeProperty("Context"); + if (contextProperty != null) { contextProperty.SetMethod.Invoke(controller, new [] { context });