inteligr8/alfresco-community-repo
1
0
Fork 0
mirror of https://github.com/Alfresco/alfresco-community-repo.git synced 2025-08-14 17:58:59 +00:00
Code Issues Packages Projects Releases Wiki Activity

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

Browse Source 
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
This commit is contained in:
Alan Davis
2016-09-06 22:09:33 +00:00
parent 58a632a3f2
commit 56ea8655c8
1 changed files with 11 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
source/java/org/alfresco/rest/framework/tools/RecognizedParamsExtractor.java
View File

@@ -356,11 +356,20 @@ public interface RecognizedParamsExtractor
} }
catch (NumberFormatException error) catch (NumberFormatException error)
{ {
String errorMsg = "Invalid paging parameters skipCount: " + skip + ", maxItems:" + maxItems;
if (rpeLogger().isDebugEnabled()) 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); return Paging.valueOf(skipped, max);