From 58a632a3f2e8a15d31573524bfb1847543c20c21 Mon Sep 17 00:00:00 2001
From: Alan Davis <alan.davis@alfresco.com>
Date: Tue, 6 Sep 2016 22:09:24 +0000
Subject: [PATCH] Merged 5.2.N (5.2.1) to HEAD (5.2)    130290 gjames: Merged
 searchapi (5.2.1) to 5.2.N (5.2.1)       130029 gjames: Manual merge of
 r129701:mmuller:Add a specific error message for the maxItem=0. REPO-890

git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@130362 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
---
 .../rest/framework/tools/RecognizedParamsExtractor.java   | 8 ++++++--
 1 file changed, 6 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 c9cd7f76ab..34304ae07c 100644
--- a/source/java/org/alfresco/rest/framework/tools/RecognizedParamsExtractor.java
+++ b/source/java/org/alfresco/rest/framework/tools/RecognizedParamsExtractor.java
@@ -345,9 +345,13 @@ public interface RecognizedParamsExtractor
         {
             if (skip != null) { skipped = Integer.parseInt(skip);}
             if (maxItems != null) { max = Integer.parseInt(maxItems); }
-            if (max < 0 || skipped < 0)
+            if (skipped < 0)
             {
-                throw new InvalidArgumentException("Negative values not supported.");
+                throw new InvalidArgumentException("Negative values not supported for skipCount.");
+            }
+            if (max < 1)
+            {
+                throw new InvalidArgumentException("Only positive values supported for maxItems.");
             }
         }
         catch (NumberFormatException error)