From 56ea8655c82367a5fbaded62697c605d77d03b1f Mon Sep 17 00:00:00 2001
From: Alan Davis <alan.davis@alfresco.com>
Date: Tue, 6 Sep 2016 22:09:33 +0000
Subject: [PATCH] Merged 5.2.N (5.2.1) to HEAD (5.2)    130291 gjames: Merged
 searchapi (5.2.1) to 5.2.N (5.2.1)       130030 gjames: Manual merge of
 r129730 and r129731: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@130363 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
---
 .../framework/tools/RecognizedParamsExtractor.java  | 13 +++++++++++--
 1 file changed, 11 insertions(+), 2 deletions(-)

diff --git a/source/java/org/alfresco/rest/framework/tools/RecognizedParamsExtractor.java b/source/java/org/alfresco/rest/framework/tools/RecognizedParamsExtractor.java
index 34304ae07c..360151e527 100644
--- a/source/java/org/alfresco/rest/framework/tools/RecognizedParamsExtractor.java
+++ b/source/java/org/alfresco/rest/framework/tools/RecognizedParamsExtractor.java
@@ -356,11 +356,20 @@ public interface RecognizedParamsExtractor
         }
         catch (NumberFormatException error)
         {
+            String errorMsg = "Invalid paging parameters skipCount: " + skip + ", maxItems:" + maxItems;
             if (rpeLogger().isDebugEnabled())
             {
-                rpeLogger().debug("Invalid paging params skip: " + skip + ",maxItems:" + maxItems);
+                rpeLogger().debug(errorMsg);
             }
-            throw new InvalidArgumentException();
+            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);