From 96d2e2d3baee92414a76715dea4150cb294abbbb Mon Sep 17 00:00:00 2001 From: Sebastien Ros Date: Fri, 16 May 2014 12:08:45 -0700 Subject: [PATCH] Fixing NRE in dashboard --- .../Orchard.OutputCache/Filters/OutputCacheFilter.cs | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) diff --git a/src/Orchard.Web/Modules/Orchard.OutputCache/Filters/OutputCacheFilter.cs b/src/Orchard.Web/Modules/Orchard.OutputCache/Filters/OutputCacheFilter.cs index 19f5899a8..be0cf2d53 100644 --- a/src/Orchard.Web/Modules/Orchard.OutputCache/Filters/OutputCacheFilter.cs +++ b/src/Orchard.Web/Modules/Orchard.OutputCache/Filters/OutputCacheFilter.cs @@ -86,7 +86,6 @@ namespace Orchard.OutputCache.Filters { private CapturingResponseFilter _filter; private CacheItem _cacheItem; - public ILogger Logger { get; set; } public void OnActionExecuting(ActionExecutingContext filterContext) { @@ -291,12 +290,22 @@ namespace Orchard.OutputCache.Filters { } public void OnActionExecuted(ActionExecutedContext filterContext) { + // this means the cache module is not applied in this context + if (_workContext == null) { + return; + } + // handle redirections _transformRedirect = TransformRedirect(filterContext); } public void OnResultExecuted(ResultExecutedContext filterContext) { + // this means the cache module is not applied in this context + if (_workContext == null) { + return; + } + var response = filterContext.HttpContext.Response; if (!_cacheControlStrategy.IsCacheable(filterContext.Result, response)) {