From fc99db194d06d02d70d5fe1bfe9ba9271e8040e8 Mon Sep 17 00:00:00 2001
From: Alan Davis <alan.davis@alfresco.com>
Date: Tue, 6 Sep 2016 14:41:53 +0000
Subject: [PATCH] Merged 5.2.N (5.2.1) to HEAD (5.2)    129730 mmuller: Add a
 specific error message for invalid maxItem and skipCount. REPO-1061.

git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@130221 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
---
 .../webscripts/ResourceWebScriptHelper.java         | 13 +++++++++++--
 1 file changed, 11 insertions(+), 2 deletions(-)

diff --git a/source/java/org/alfresco/rest/framework/webscripts/ResourceWebScriptHelper.java b/source/java/org/alfresco/rest/framework/webscripts/ResourceWebScriptHelper.java
index 3174c10229..69d197f392 100644
--- a/source/java/org/alfresco/rest/framework/webscripts/ResourceWebScriptHelper.java
+++ b/source/java/org/alfresco/rest/framework/webscripts/ResourceWebScriptHelper.java
@@ -800,9 +800,18 @@ public class ResourceWebScriptHelper
         {
             if (logger.isDebugEnabled())
             {
-                logger.debug("Invalid paging params skip: " + skip + ",maxItems:" + maxItems);
+                logger.debug("Invalid paging parameters skipCount: " + skip + ", maxItems:" + maxItems);
             }
-            throw new InvalidArgumentException();
+            String errorMsg = "Invalid paging parameters skipCount: " + skip + ", maxItems:" + maxItems;
+            if (skip == null)
+            {
+                errorMsg = "Invalid paging parameter maxItems:" + maxItems;
+            }
+            if (maxItems == null)
+            {
+                errorMsg = "Invalid paging parameter skipCount:" + skip;
+            }
+            throw new InvalidArgumentException(errorMsg);
         }
 
         return Paging.valueOf(skipped, max);