[BUGFIX] Avoid getSolrConfiguration() on null

Closes: #3596 Fixes: #3407, #3597
TYPO3-Solr · Apr 13, 2023 · 14a0e2f · 14a0e2f
1 parent acb0578
commit 14a0e2f
Showing 1 changed file with 8 additions and 3 deletions.
diff --git a/Classes/IndexQueue/Queue.php b/Classes/IndexQueue/Queue.php
@@ -201,15 +201,20 @@ protected function updateOrAddItemForAllRelatedRootPages(string $itemType, $item
             return 0;
         }
 
+        /* @var SiteRepository $siteRepository */
+        $siteRepository = GeneralUtility::makeInstance(SiteRepository::class);
         foreach ($rootPageIds as $rootPageId) {
             $skipInvalidRootPage = $rootPageId === 0;
             if ($skipInvalidRootPage) {
                 continue;
             }
 
-            /* @var SiteRepository $siteRepository */
-            $siteRepository = GeneralUtility::makeInstance(SiteRepository::class);
-            $solrConfiguration = $siteRepository->getSiteByRootPageId($rootPageId)->getSolrConfiguration();
+            $site = $siteRepository->getSiteByRootPageId($rootPageId);
+            if ($site === null) {
+                continue;
+            }
+
+            $solrConfiguration = $site->getSolrConfiguration();
             $indexingConfiguration = $this->recordService->getIndexingConfigurationName($itemType, $itemUid, $solrConfiguration);
             if ($indexingConfiguration === null) {
                 continue;