From 9c4ddc2e52518372cb2887566834811da90f5be9 Mon Sep 17 00:00:00 2001
From: Nicolas Barithel <nicolas.barithel@hyland.com>
Date: Thu, 3 Feb 2022 18:28:03 +0100
Subject: [PATCH] MNT-22817: Fix flow when unable to retrieve node's metadata

---
 .../main/java/org/alfresco/solr/SolrInformationServer.java  | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/search-services/alfresco-search/src/main/java/org/alfresco/solr/SolrInformationServer.java b/search-services/alfresco-search/src/main/java/org/alfresco/solr/SolrInformationServer.java
index c77048a63..6d9a9fa52 100644
--- a/search-services/alfresco-search/src/main/java/org/alfresco/solr/SolrInformationServer.java
+++ b/search-services/alfresco-search/src/main/java/org/alfresco/solr/SolrInformationServer.java
@@ -1720,7 +1720,11 @@ public class SolrInformationServer implements InformationServer
 
                 Optional<Collection<NodeMetaData>> nodeMetaDatas = getNodesMetaDataFromRepository(nmdp);
 
-                if (nodeMetaDatas.isEmpty() || nodeMetaDatas.get().isEmpty()) return;
+                if (nodeMetaDatas.isEmpty() || nodeMetaDatas.get().isEmpty())
+                {
+                    // Using exception for flow handling to jump to error node processing.
+                    throw new Exception("Error loading node metadata from repository.");
+                }
 
                 NodeMetaData nodeMetaData = nodeMetaDatas.get().iterator().next();
                 if (node.getTxnId() == Long.MAX_VALUE)