[BUGFIX:BP:11.5] Avoid getSolrConfiguration() on null

Ports: TYPO3-Solr#3598 Closes: TYPO3-Solr#3596 Fixes: TYPO3-Solr#3407, TYPO3-Solr#3597
dkd-friedrich · Apr 14, 2023 · c566c8e · c566c8e
1 parent e36eae5
commit c566c8e
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;