lsm/Orchard
1
0
Fork 0
mirror of https://github.com/OrchardCMS/Orchard.git synced 2026-01-24 05:42:10 +08:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

#20314: DefaultShapeTableManager doesn't keep IShapeTableProviders alive too long any more either.

Browse Source 
Work Item: 20314
This commit is contained in:
Lombiq
2014-10-08 12:41:03 +02:00
committed by Zoltán Lehóczky
parent 0440d866e2
commit 411e3f9ddd
1 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/Orchard/DisplayManagement/Descriptors/DefaultShapeTableManager.cs
View File

@@ -13,14 +13,14 @@ using Orchard.Utility.Extensions;
namespace Orchard.DisplayManagement.Descriptors {
public class DefaultShapeTableManager : IShapeTableManager {
private readonly IEnumerable<Meta<IShapeTableProvider>> _bindingStrategies;
private readonly Work<IEnumerable<Meta<IShapeTableProvider>>> _bindingStrategiesWork;
private readonly IExtensionManager _extensionManager;
private readonly ICacheManager _cacheManager;
private readonly IParallelCacheContext _parallelCacheContext;
private readonly Work<IEnumerable<IShapeTableEventHandler>> _shapeTableEventHandlersWork;
public DefaultShapeTableManager(
IEnumerable<Meta<IShapeTableProvider>> bindingStrategies,
Work<IEnumerable<Meta<IShapeTableProvider>>> bindingStrategiesWork,
IExtensionManager extensionManager,
ICacheManager cacheManager,
IParallelCacheContext parallelCacheContext,
@@ -30,7 +30,7 @@ namespace Orchard.DisplayManagement.Descriptors {
_cacheManager = cacheManager;
_parallelCacheContext = parallelCacheContext;
_shapeTableEventHandlersWork = shapeTableEventHandlersWork;
_bindingStrategies = bindingStrategies;
_bindingStrategiesWork = bindingStrategiesWork;
Logger = NullLogger.Instance;
}
@@ -40,7 +40,7 @@ namespace Orchard.DisplayManagement.Descriptors {
return _cacheManager.Get(themeName ?? "", x => {
Logger.Information("Start building shape table");
var alterationSets = _parallelCacheContext.RunInParallel(_bindingStrategies, bindingStrategy => {
var alterationSets = _parallelCacheContext.RunInParallel(_bindingStrategiesWork.Value, bindingStrategy => {
Feature strategyDefaultFeature = bindingStrategy.Metadata.ContainsKey("Feature") ?
(Feature)bindingStrategy.Metadata["Feature"] :
null;