From 87e1b407f426ab31145d0d6a4ed90e937b0c2dc9 Mon Sep 17 00:00:00 2001
From: Manish Kumar <manish.kumar@hyland.com>
Date: Thu, 23 Jan 2025 17:34:54 +0530
Subject: [PATCH] [ACS-9073] address review comments

---
 .../solr/handler/component/AlfrescoSolrHighlighter.java    | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/search-services/alfresco-search/src/main/java/org/apache/solr/handler/component/AlfrescoSolrHighlighter.java b/search-services/alfresco-search/src/main/java/org/apache/solr/handler/component/AlfrescoSolrHighlighter.java
index d461e3a46..99cfba378 100644
--- a/search-services/alfresco-search/src/main/java/org/apache/solr/handler/component/AlfrescoSolrHighlighter.java
+++ b/search-services/alfresco-search/src/main/java/org/apache/solr/handler/component/AlfrescoSolrHighlighter.java
@@ -352,12 +352,15 @@ public class AlfrescoSolrHighlighter extends DefaultSolrHighlighter implements P
 		if (highlightFieldEntry.getValue() instanceof String[])
 		{
 			String [] snippets = (String[])highlightFieldEntry.getValue();
-			if (snippets.length > 0)
+			if (snippets != null && snippets.length > 0 && snippets[0] != null)
 			{
                 if (snippets[0].charAt(0) == '\u0000')
                 {
                     int pos = snippets[0].indexOf('\u0000',1);
-                    snippets[0] = snippets[0].substring(pos + 1);
+                    if(pos != -1)
+                    {
+                        snippets[0] = snippets[0].substring(pos + 1);
+                    }
                 }
 			}
 		}