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

130298 gjames: Merged searchapi (5.2.1) to 5.2.N (5.2.1)
      130051 gjames: SEARCH-159: Don't allow sort for cmis_alfresco language


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@130370 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
This commit is contained in:
Alan Davis
2016-09-06 22:10:34 +00:00
parent b10f889f29
commit 5c7fe2d39b
2 changed files with 3 additions and 2 deletions

View File

@@ -170,7 +170,7 @@ public class SearchMapper
{
if (sort != null && !sort.isEmpty())
{
if (CMIS.equals(sp.getLanguage()))
if (LANGUAGE_CMIS_ALFRESCO.equals(sp.getLanguage()))
{
throw new InvalidArgumentException(InvalidArgumentException.DEFAULT_MESSAGE_ID,
new Object[] { ": sort {} not allowed with cmis language" });