From e52aa83b43b9a1dcc3a11b08ac12ecb5f96317fd Mon Sep 17 00:00:00 2001
From: Antonio Felix <antonio.felix@texter.ai>
Date: Mon, 7 Nov 2022 17:11:42 +0000
Subject: [PATCH] MNT-23276 - Protect from null facet names (#1534) (#1537)

* MNT-23276 - Protect from null facet names (#1534)

(cherry picked from commit 607118840546f8649cff348639793fec38eefcb5)
---
 .../rest/rm/community/records/DeleteRecordTests.java  |  4 ++--
 .../repo/search/impl/solr/SolrJSONResultSet.java      | 11 +++++++----
 2 files changed, 9 insertions(+), 6 deletions(-)

diff --git a/amps/ags/rm-automation/rm-automation-community-rest-api/src/test/java/org/alfresco/rest/rm/community/records/DeleteRecordTests.java b/amps/ags/rm-automation/rm-automation-community-rest-api/src/test/java/org/alfresco/rest/rm/community/records/DeleteRecordTests.java
index 8a6a500e30..9c890f2a69 100644
--- a/amps/ags/rm-automation/rm-automation-community-rest-api/src/test/java/org/alfresco/rest/rm/community/records/DeleteRecordTests.java
+++ b/amps/ags/rm-automation/rm-automation-community-rest-api/src/test/java/org/alfresco/rest/rm/community/records/DeleteRecordTests.java
@@ -318,8 +318,8 @@ public class DeleteRecordTests extends BaseRMRestTest
         RecordCategoryChild recFolder = createFolder(recordCategory.getId(), getRandomName("recFolder"));
         RecordBodyFile recordBodyFile = RecordBodyFile.builder().targetParentId(recFolder.getId()).build();
         Record recordFiled = getRestAPIFactory().getRecordsAPI().fileRecord(recordBodyFile, testFile.getNodeRefWithoutVersion());
-        getRestAPIFactory().getRecordsAPI().completeRecord(recordFiled.getId());
-        assertStatusCode(CREATED);
+        completeRecord(recordFiled.getId());
+        assertStatusCode(OK);
 
         STEP("Execute the disposition schedule steps.");
         rmRolesAndActionsAPI.executeAction(getAdminUser().getUsername(), getAdminUser().getUsername(), recordFiled.getName(),
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 814ad32a39..3c9348e9c4 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,10 +267,13 @@ 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 = facets.getString(i);
-                            Integer facetEntryCount = Integer.valueOf(facets.getInt(i+1));
-                            Pair<String, Integer> pair = new Pair<String, Integer>(facetEntryName, facetEntryCount);
-                            facetValues.add(pair);
+                            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);
+                            }
                         }
                         fieldFacets.put(fieldName, facetValues);
                     }