Merged 5.2.N (5.2.1) to HEAD (5.2)

129701 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@130218 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
This commit is contained in:
Alan Davis
2016-09-06 14:41:21 +00:00
parent bf4d313a50
commit 2a5218afb8
2 changed files with 9 additions and 5 deletions

View File

@@ -787,9 +787,13 @@ public class ResourceWebScriptHelper
{
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)