Merge branch 'patch-416' into dev

maartenba · Oct 27, 2015 · 95a2957 · 95a2957
2 parents 49f727b + f9fc69f
commit 95a2957
Showing 1 changed file with 8 additions and 2 deletions.
diff --git a/src/MvcSiteMapProvider/MvcSiteMapProvider/Web/Routing/RouteDataExtensions.cs b/src/MvcSiteMapProvider/MvcSiteMapProvider/Web/Routing/RouteDataExtensions.cs
@@ -85,8 +85,14 @@ internal static void SetMvcCodeRoutingContext(this RouteData routeData, ISiteMap
                 return;
 
             var controllerType = node.SiteMap.ResolveControllerType(node.Area, node.Controller);
-            var mvcCodeRoutingRouteContext = GetMvcCodeRoutingRouteContext(controllerType, node.Controller);
-            routeData.DataTokens["MvcCodeRouting.RouteContext"] = mvcCodeRoutingRouteContext;
+
+            // Fix for #416 - If Areas are misconfigured, controllerType may be null. Since MvcCodeRouting
+            // doesn't work in conjunction with Areas anyway, we are going to ignore this here.
+            if (controllerType != null)
+            {
+                var mvcCodeRoutingRouteContext = GetMvcCodeRoutingRouteContext(controllerType, node.Controller);
+                routeData.DataTokens["MvcCodeRouting.RouteContext"] = mvcCodeRoutingRouteContext;
+            }
         }
 
         private static string GetMvcCodeRoutingRouteContext(Type controllerType, string controllerName)