lsm/Orchard
1
0
Fork 0
mirror of https://github.com/OrchardCMS/Orchard.git synced 2025-10-14 19:04:51 +08:00
Code Issues Actions 2 Packages Projects Releases Wiki Activity

Merge pull request #5887 from jtkech/patch-2

Browse Source 
Fixes #5879: Layout part OnIndexing fails when called in a background task
This commit is contained in:
Piotr Szmyd
2015-10-05 15:36:42 +02:00
parent e6c7851cca 44a342c4fe
commit b04a22fa4b
2 changed files with 8 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
src/Orchard.Web/Modules/Orchard.OutputCache/Services/DefaultCacheStorageProvider.cs
View File

@@ -27,7 +27,8 @@ namespace Orchard.OutputCache.Services {
}
public void Remove(string key) {
_workContext.HttpContext.Cache.Remove(key);
if (_workContext.HttpContext != null)
_workContext.HttpContext.Cache.Remove(key);
}
public void RemoveAll() {
@@ -63,4 +64,4 @@ namespace Orchard.OutputCache.Services {
.Count(x => x.Tenant.Equals(_tenantName, StringComparison.OrdinalIgnoreCase));
}
}
}
}

6
src/Orchard/Environment/WorkContextAccessor.cs
View File

@@ -27,7 +27,11 @@ namespace Orchard.Environment {
}
public WorkContext GetContext(HttpContextBase httpContext) {
return httpContext.Items[_workContextKey] as WorkContext;
if (!httpContext.IsBackgroundContext())
return httpContext.Items[_workContextKey] as WorkContext;
WorkContext workContext;
return EnsureThreadStaticContexts().TryGetValue(_workContextKey, out workContext) ? workContext : null;
}
public WorkContext GetContext() {