yv01p/Umbraco-CMS
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

https://github.com/umbraco/Umbraco-CMS/issues/10394 - Fixes issue with "Rebuild" not really doing anything, because the "null" injected was not handled like "All", but instead ignored the type.

Browse Source
This commit is contained in:
Bjarke Berg
2021-06-23 11:31:08 +02:00
parent cc495d66b1
commit df43b87f43
2 changed files with 6 additions and 27 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
src/Umbraco.PublishedCache.NuCache/Persistence/NuCacheContentRepository.cs
View File

@@ -101,20 +101,9 @@ namespace Umbraco.Cms.Infrastructure.PublishedCache.Persistence
IReadOnlyCollection<int> mediaTypeIds = null,
IReadOnlyCollection<int> memberTypeIds = null)
{
if (contentTypeIds != null)
{
RebuildContentDbCache(groupSize, contentTypeIds);
}
if (mediaTypeIds != null)
{
RebuildContentDbCache(groupSize, mediaTypeIds);
}
if (memberTypeIds != null)
{
RebuildContentDbCache(groupSize, memberTypeIds);
}
RebuildContentDbCache(groupSize, contentTypeIds);
RebuildContentDbCache(groupSize, mediaTypeIds);
RebuildContentDbCache(groupSize, memberTypeIds);
}
// assumes content tree lock

16
src/Umbraco.PublishedCache.NuCache/Persistence/NuCacheContentService.cs
View File

@@ -79,20 +79,10 @@ namespace Umbraco.Cms.Infrastructure.PublishedCache.Persistence
{
using (IScope scope = ScopeProvider.CreateScope(repositoryCacheMode: RepositoryCacheMode.Scoped))
{
if (contentTypeIds != null)
{
scope.ReadLock(Constants.Locks.ContentTree);
}
if (mediaTypeIds != null)
{
scope.ReadLock(Constants.Locks.MediaTree);
}
if (memberTypeIds != null)
{
scope.ReadLock(Constants.Locks.MemberTree);
}
scope.ReadLock(Constants.Locks.ContentTree);
scope.ReadLock(Constants.Locks.MediaTree);
scope.ReadLock(Constants.Locks.MemberTree);
_repository.Rebuild(groupSize, contentTypeIds, mediaTypeIds, memberTypeIds);
scope.Complete();