lsm/Orchard
1
0
Fork 0
mirror of https://github.com/OrchardCMS/Orchard.git synced 2026-02-09 09:16:41 +08:00
Code Issues Actions 2 Packages Projects Releases Wiki Activity

Fixing NRE in DefaultTagCache (#8135)

Browse Source
This commit is contained in:
Sébastien Ros
2018-11-06 09:17:22 -08:00
committed by GitHub
parent 3c3f58fb3c
commit bb6c8ed624
1 changed files with 33 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

48
src/Orchard.Web/Modules/Orchard.OutputCache/Services/DefaultTagCache.cs
View File

@@ -2,32 +2,27 @@
using System.Collections.Concurrent;
using System.Collections.Generic;
using System.Linq;
using Orchard.Utility.Extensions;
using Orchard.Environment.Configuration;
using System.Web.Caching;
using Orchard.Environment.Configuration;
using Orchard.Utility.Extensions;
namespace Orchard.OutputCache.Services {
/// <summary>
/// Tenant wide case insensitive reverse index for <see cref="CacheItem"/> tags.
/// </summary>
public class DefaultTagCache : ITagCache {
private readonly ConcurrentDictionary<string, HashSet<string>> _dictionary;
private ConcurrentDictionary<string, HashSet<string>> _dictionary;
private readonly string _cacheKey;
private readonly IWorkContextAccessor _workContextAccessor;
public DefaultTagCache(IWorkContextAccessor workContextAccessor, ShellSettings shellSettings) {
var key = shellSettings.Name + ":TagCache";
var workContext = workContextAccessor.GetContext();
if ( workContext != null ) {
_dictionary = workContext.HttpContext.Cache.Get(key) as ConcurrentDictionary<string, HashSet<string>>;
if ( _dictionary == null ) {
_dictionary = new ConcurrentDictionary<string, HashSet<string>>(StringComparer.OrdinalIgnoreCase);
workContext.HttpContext.Cache.Add(key, _dictionary, null, Cache.NoAbsoluteExpiration, Cache.NoSlidingExpiration, CacheItemPriority.Normal, null);
}
}
_cacheKey = $"{shellSettings.Name}:TagCache";
_workContextAccessor = workContextAccessor;
}
public void Tag(string tag, params string[] keys) {
EnsureInitialized();
var set = _dictionary.GetOrAdd(tag, x => new HashSet<string>());
lock (set) {
@@ -38,6 +33,8 @@ namespace Orchard.OutputCache.Services {
}
public IEnumerable<string> GetTaggedItems(string tag) {
EnsureInitialized();
HashSet<string> set;
if (_dictionary.TryGetValue(tag, out set)) {
lock (set) {
@@ -49,8 +46,29 @@ namespace Orchard.OutputCache.Services {
}
public void RemoveTag(string tag) {
EnsureInitialized();
HashSet<string> set;
_dictionary.TryRemove(tag, out set);
}
private void EnsureInitialized() {
if (_dictionary == null) {
lock (this) {
if (_dictionary == null) {
var workContext = _workContextAccessor.GetContext();
if (workContext != null) {
_dictionary = workContext.HttpContext.Cache.Get(_cacheKey) as ConcurrentDictionary<string, HashSet<string>>;
if (_dictionary == null) {
_dictionary = new ConcurrentDictionary<string, HashSet<string>>(StringComparer.OrdinalIgnoreCase);
workContext.HttpContext.Cache.Add(_cacheKey, _dictionary, null, Cache.NoAbsoluteExpiration, Cache.NoSlidingExpiration, CacheItemPriority.Normal, null);
}
}
}
}
}
}
}
}
}