From 4cc44bb4b234d5e0b9694b99381162747e03ca11 Mon Sep 17 00:00:00 2001 From: Martin Muller Date: Fri, 5 Aug 2016 13:46:33 +0000 Subject: [PATCH] Merged RETURN-OF-THE-API (5.2.0) to 5.2.N (5.2.1) 128487 jvonka: V1 REST API: Node Version History - add basic paging - follow-on fix for NPE REPO-313 git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/BRANCHES/DEV/5.2.N/root@129164 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261 --- .../org/alfresco/rest/api/nodes/AbstractNodeRelation.java | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/source/java/org/alfresco/rest/api/nodes/AbstractNodeRelation.java b/source/java/org/alfresco/rest/api/nodes/AbstractNodeRelation.java index 35300856af..72f0f8bb40 100644 --- a/source/java/org/alfresco/rest/api/nodes/AbstractNodeRelation.java +++ b/source/java/org/alfresco/rest/api/nodes/AbstractNodeRelation.java @@ -53,6 +53,7 @@ import org.springframework.beans.factory.InitializingBean; import java.util.ArrayList; import java.util.Arrays; +import java.util.Collections; import java.util.HashMap; import java.util.HashSet; import java.util.Iterator; @@ -208,6 +209,11 @@ public class AbstractNodeRelation implements InitializingBean int pageEnd = skipCount + pageSize; final List page = new ArrayList<>(pageSize); + if (result == null) + { + result = Collections.emptyList(); + } + Iterator it = result.iterator(); for (int counter = 0; counter < pageEnd && it.hasNext(); counter++) {