lsm/Orchard
1
0
Fork 0
mirror of https://github.com/OrchardCMS/Orchard.git synced 2026-01-19 17:51:45 +08:00
Code Issues Actions 2 Packages Projects Releases Wiki Activity

- Moved condition of ContentType not null in a try catch statement to handle the case the ContentItem was destroyed (#8335)

Browse Source
This commit is contained in:
Hermes Sbicego
2020-03-19 20:05:53 +01:00
committed by GitHub
parent 27e6401965
commit e4b251b9ce
1 changed files with 19 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
src/Orchard.Web/Modules/Orchard.Indexing/Services/IndexingTaskExecutor.cs
View File

@@ -223,11 +223,25 @@ namespace Orchard.Indexing.Services {
.OrderBy(x => x.Id)
.Take(ContentItemsPerLoop)
.ToList()
// In some rare cases a ContentItemRecord without a ContentType can end up in the DB.
// We need to filter out such records, otherwise they will crash the ContentManager.
.Where(x => x.ContentItemRecord != null && x.ContentItemRecord.ContentType != null)
.Where(x => x.ContentItemRecord != null)
.GroupBy(x => x.ContentItemRecord.Id)
.Select(group => new { TaskId = group.Max(task => task.Id), Delete = group.Last().Action == IndexingTaskRecord.Delete, Id = group.Key, ContentItem = _contentManager.Get(group.Key, VersionOptions.Latest) })
.Select(group => new {
TaskId = group.Max(task => task.Id),
Delete = group.Last().Action == IndexingTaskRecord.Delete,
Id = group.Key,
// We can only have a ContentItem if the ContentItemRecord matches
// something that still exists in our records.
ContentItem = group.All(x => {
try {
return x.ContentItemRecord != null
// ContentType is required to build the ContentItem
&& x.ContentItemRecord.ContentType != null;
}
catch {
return false;
}
}) ? _contentManager.Get(group.Key, VersionOptions.Latest) : null // Set to null to "tell" it's a delete/destroy
})
.OrderBy(x => x.TaskId)
.ToArray();
@@ -274,7 +288,7 @@ namespace Orchard.Indexing.Services {
}
} while (loop);
}
}
// save current state of the index
indexSettings.LastIndexedUtc = _clock.UtcNow;