Fixing NRE in CacheService with multi tenants

This commit is contained in:
Sebastien Ros
2013-11-06 16:06:25 -08:00
parent 2cccd945e4
commit a9c9ae1d22

View File

@@ -63,8 +63,18 @@ namespace Orchard.OutputCache.Services {
public string GetRouteDescriptorKey(HttpContextBase httpContext, RouteBase routeBase) {
var route = routeBase as Route;
var dataTokens = new RouteValueDictionary();
var dataTokens = route != null ? route.DataTokens : routeBase.GetRouteData(httpContext).DataTokens;
if (route != null) {
dataTokens = route.DataTokens;
}
else {
var routeData = routeBase.GetRouteData(httpContext);
if (routeData != null) {
dataTokens = routeData.DataTokens;
}
}
var keyBuilder = new StringBuilder();