inteligr8/alfresco-community-repo
1
0
Fork 0
mirror of https://github.com/Alfresco/alfresco-community-repo.git synced 2025-09-17 14:21:39 +00:00
Code Issues Packages Projects Releases Wiki Activity

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

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

(cherry picked from commit 6071188405)
This commit is contained in:
Antonio Felix
2022-11-07 17:11:42 +00:00
committed by GitHub
parent c2d59e2a77
commit e52aa83b43
2 changed files with 9 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
amps/ags/rm-automation/rm-automation-community-rest-api/src/test/java/org/alfresco/rest/rm/community/records/DeleteRecordTests.java
View File

@@ -318,8 +318,8 @@ public class DeleteRecordTests extends BaseRMRestTest
RecordCategoryChild recFolder = createFolder(recordCategory.getId(), getRandomName("recFolder")); RecordCategoryChild recFolder = createFolder(recordCategory.getId(), getRandomName("recFolder"));
RecordBodyFile recordBodyFile = RecordBodyFile.builder().targetParentId(recFolder.getId()).build(); RecordBodyFile recordBodyFile = RecordBodyFile.builder().targetParentId(recFolder.getId()).build();
Record recordFiled = getRestAPIFactory().getRecordsAPI().fileRecord(recordBodyFile, testFile.getNodeRefWithoutVersion()); Record recordFiled = getRestAPIFactory().getRecordsAPI().fileRecord(recordBodyFile, testFile.getNodeRefWithoutVersion());
getRestAPIFactory().getRecordsAPI().completeRecord(recordFiled.getId()); completeRecord(recordFiled.getId());
assertStatusCode(CREATED); assertStatusCode(OK);
STEP("Execute the disposition schedule steps."); STEP("Execute the disposition schedule steps.");
rmRolesAndActionsAPI.executeAction(getAdminUser().getUsername(), getAdminUser().getUsername(), recordFiled.getName(), rmRolesAndActionsAPI.executeAction(getAdminUser().getUsername(), getAdminUser().getUsername(), recordFiled.getName(),

5
repository/src/main/java/org/alfresco/repo/search/impl/solr/SolrJSONResultSet.java
View File

@@ -266,12 +266,15 @@ public class SolrJSONResultSet implements SearchEngineResultSet {
int facetArraySize = facets.length(); int facetArraySize = facets.length();
ArrayList<Pair<String, Integer>> facetValues = new ArrayList<Pair<String, Integer>>(facetArraySize/2); ArrayList<Pair<String, Integer>> facetValues = new ArrayList<Pair<String, Integer>>(facetArraySize/2);
for(int i = 0; i < facetArraySize; i+=2) for(int i = 0; i < facetArraySize; i+=2)
{
if(!facets.isNull(i))
{ {
String facetEntryName = facets.getString(i); String facetEntryName = facets.getString(i);
Integer facetEntryCount = Integer.valueOf(facets.getInt(i+1)); Integer facetEntryCount = Integer.valueOf(facets.getInt(i + 1));
Pair<String, Integer> pair = new Pair<String, Integer>(facetEntryName, facetEntryCount); Pair<String, Integer> pair = new Pair<String, Integer>(facetEntryName, facetEntryCount);
facetValues.add(pair); facetValues.add(pair);
} }
}
fieldFacets.put(fieldName, facetValues); fieldFacets.put(fieldName, facetValues);
} }
} }