From 8f8743f4b58aa8ab2cad5a3ef5d44304a9858088 Mon Sep 17 00:00:00 2001
From: Antonio Felix <antonio.felix@texter.ai>
Date: Wed, 9 Nov 2022 14:05:38 +0000
Subject: [PATCH] MNT-23276 - The null facet name should be considered (#1540)
 (#1543)

(cherry picked from commit 295a8f7ba2925308b54a5599289ab0ea2609bb3b)
---
 .../repo/search/impl/solr/SolrJSONResultSet.java         | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/repository/src/main/java/org/alfresco/repo/search/impl/solr/SolrJSONResultSet.java b/repository/src/main/java/org/alfresco/repo/search/impl/solr/SolrJSONResultSet.java
index 3c9348e9c4..ecb48adb40 100644
--- a/repository/src/main/java/org/alfresco/repo/search/impl/solr/SolrJSONResultSet.java
+++ b/repository/src/main/java/org/alfresco/repo/search/impl/solr/SolrJSONResultSet.java
@@ -267,13 +267,14 @@ public class SolrJSONResultSet implements SearchEngineResultSet {
                         ArrayList<Pair<String, Integer>> facetValues = new ArrayList<Pair<String, Integer>>(facetArraySize/2);
                         for(int i = 0; i < facetArraySize; i+=2)
                         {
+                            String facetEntryName = "Null";
                             if(!facets.isNull(i))
                             {
-                                String facetEntryName = facets.getString(i);
-                                Integer facetEntryCount = Integer.valueOf(facets.getInt(i + 1));
-                                Pair<String, Integer> pair = new Pair<String, Integer>(facetEntryName, facetEntryCount);
-                                facetValues.add(pair);
+                                facetEntryName = facets.getString(i);
                             }
+                            Integer facetEntryCount = Integer.valueOf(facets.getInt(i + 1));
+                            Pair<String, Integer> pair = new Pair<String, Integer>(facetEntryName, facetEntryCount);
+                            facetValues.add(pair);
                         }
                         fieldFacets.put(fieldName, facetValues);
                     }