From 8246883aec428486d4765aa853974ed4e69d7227 Mon Sep 17 00:00:00 2001 From: Steve Bohlen Date: Sun, 1 Feb 2015 20:54:31 -0500 Subject: [PATCH] re-order logic flow to fix failing test case where serviceType arg is null --- src/Spring/Spring.Web.Mvc3/SpringMvcDependencyResolver.cs | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/src/Spring/Spring.Web.Mvc3/SpringMvcDependencyResolver.cs b/src/Spring/Spring.Web.Mvc3/SpringMvcDependencyResolver.cs index 8a87da3d..802d90d8 100644 --- a/src/Spring/Spring.Web.Mvc3/SpringMvcDependencyResolver.cs +++ b/src/Spring/Spring.Web.Mvc3/SpringMvcDependencyResolver.cs @@ -67,13 +67,9 @@ namespace Spring.Web.Mvc /// The requested service or object. public object GetService(Type serviceType) { - if (serviceType.FullName.StartsWith(IgnoreViewNamespace)) - { - return null; - } object service = null; - if (serviceType != null) + if (serviceType != null && !serviceType.FullName.StartsWith(IgnoreViewNamespace)) { var services = ApplicationContext.GetObjectsOfType(serviceType); if (services.Count > 0)