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

Misc cleanup of PR

Browse Source
This commit is contained in:
Stephan
2018-07-09 17:29:50 +02:00
parent 52be2d7864
commit e644b63ba6
3 changed files with 9 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
src/Umbraco.Web/PublishedCache/XmlPublishedCache/PublishedMediaCache.cs
View File

@@ -493,12 +493,13 @@ namespace Umbraco.Web.PublishedCache.XmlPublishedCache
/// <returns></returns>
private IEnumerable<IPublishedContent> GetChildrenMedia(int parentId, XPathNavigator xpath = null)
{
//if there is no navigator, try examine first, then re-look it up
// if there *is* a navigator, directly look it up
if (xpath != null)
{
return ToIPublishedContent(parentId, xpath);
}
// otherwise, try examine first, then re-look it up
var searchProvider = GetSearchProviderSafe();
if (searchProvider != null)
@@ -545,7 +546,10 @@ namespace Umbraco.Web.PublishedCache.XmlPublishedCache
}
}
//falling back to get media
// falling back to get media
// was library.GetMedia which had its own cache, but MediaService *also* caches
// so, library.GetMedia is gone and now we directly work with MediaService
// (code below copied from what library was doing)
var media = Current.Services.MediaService.GetById(parentId);
if (media == null)
{
@@ -563,13 +567,9 @@ namespace Umbraco.Web.PublishedCache.XmlPublishedCache
var mediaIterator = serialized.CreateNavigator().Select("/");
if (mediaIterator.Current == null)
{
return Enumerable.Empty<IPublishedContent>();
}
xpath = mediaIterator.Current;
return ToIPublishedContent(parentId, xpath);
return mediaIterator.Current == null
? Enumerable.Empty<IPublishedContent>()
: ToIPublishedContent(parentId, mediaIterator.Current);
}