diff --git a/remote-api/src/main/java/org/alfresco/rest/api/nodes/NodeFolderSizeRelation.java b/remote-api/src/main/java/org/alfresco/rest/api/nodes/NodeFolderSizeRelation.java index 451d6bdafb..dac3abe0fd 100644 --- a/remote-api/src/main/java/org/alfresco/rest/api/nodes/NodeFolderSizeRelation.java +++ b/remote-api/src/main/java/org/alfresco/rest/api/nodes/NodeFolderSizeRelation.java @@ -202,14 +202,17 @@ public class NodeFolderSizeRelation implements RelationshipResourceAction.Calcul { LOG.info("Retrieving OUTPUT from ActionExecutor in NodeFolderSizeRelation:readById"); Map result = new HashMap<>(); + if (properties == null || !properties.containsKey(FolderSizeModel.PROP_OUTPUT)) { result.put("status", "NOT-INITIATED"); } - else if(properties.containsKey(FolderSizeModel.PROP_OUTPUT)) + else { Map mapResult = (Map) properties.get(FolderSizeModel.PROP_OUTPUT); - if(mapResult.get(0).toString().contains("IN-PROGRESS")) + Object status = mapResult.get("status"); + + if (status != null && status.toString().contains("IN-PROGRESS")) { result.put("status", "IN-PROGRESS"); } @@ -227,4 +230,5 @@ public class NodeFolderSizeRelation implements RelationshipResourceAction.Calcul throw ex; // Rethrow with original stack trace } } + } \ No newline at end of file