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
This commit is contained in:
Alan Davis
2016-09-06 22:09:24 +00:00
parent bdca31ff6a
commit 58a632a3f2

View File

@@ -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)