Workaround for possible NRE while indexing ContentItemRecords. (Orcha…

…rdCMS#7937) (OrchardCMS#7938)
carlwoodhouse · Jan 18, 2018 · 7b971f4 · 7b971f4
1 parent 5753a7c
commit 7b971f4
Showing 1 changed file with 6 additions and 0 deletions.
diff --git a/src/Orchard.Web/Modules/Orchard.Indexing/Services/IndexingTaskExecutor.cs b/src/Orchard.Web/Modules/Orchard.Indexing/Services/IndexingTaskExecutor.cs
@@ -160,6 +160,9 @@ public class IndexingTaskExecutor : IIndexingTaskExecutor, IIndexStatisticsProvi
                         .OrderBy(versionRecord => versionRecord.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)
                         .Select(versionRecord => _contentManager.Get(versionRecord.ContentItemRecord.Id, VersionOptions.VersionRecord(versionRecord.Id)))
                         .Distinct()
                         .ToList();
@@ -220,6 +223,9 @@ public class IndexingTaskExecutor : IIndexingTaskExecutor, IIndexStatisticsProvi
                         .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)
                         .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) })
                         .OrderBy(x => x.TaskId)