From 9461cd397f69e64d6f28af3851979dea7bbf54b0 Mon Sep 17 00:00:00 2001
From: tiagosalvado10 <9038083+tiagosalvado10@users.noreply.github.com>
Date: Tue, 30 Nov 2021 11:34:30 +0000
Subject: [PATCH] Merge pull request #1272 from
 Alfresco/fix/MNT-22714_cascade-tracker-add-npe-validation

[MNT-22714] Added validation to prevent NPE when cascade tracker is disabled

(cherry picked from commit a2321e079a62c6afba61b48a5706f215505f7912)
---
 .../src/main/java/org/alfresco/solr/HandlerReportHelper.java | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/search-services/alfresco-search/src/main/java/org/alfresco/solr/HandlerReportHelper.java b/search-services/alfresco-search/src/main/java/org/alfresco/solr/HandlerReportHelper.java
index e30f8b8ce..3773fbcb4 100644
--- a/search-services/alfresco-search/src/main/java/org/alfresco/solr/HandlerReportHelper.java
+++ b/search-services/alfresco-search/src/main/java/org/alfresco/solr/HandlerReportHelper.java
@@ -502,7 +502,10 @@ class HandlerReportHelper
         coreSummary.add("ContentTracker Enabled", contentTrkr.isEnabled());
         coreSummary.add("MetadataTracker Enabled", metaTrkr.isEnabled());
         coreSummary.add("AclTracker Enabled", aclTrkr.isEnabled());
-        coreSummary.add("CascadeTracker Enabled", cascadeTracker.isEnabled());
+        if (cascadeTracker != null)
+        {
+            coreSummary.add("CascadeTracker Enabled", cascadeTracker.isEnabled());
+        }
 
         // TX