Merged 5.2.0 (5.2.0) to HEAD (5.2)

134766 mmuller: Merged 5.2.N (5.2.1) to 5.2.0 (5.2.0)
      134753 mmuller: Merged 5.2.N-REPO-1815 (5.2.1) to 5.2.N (5.2.1)
         134749 mmuller: REPO-1815 / ACE-5753 check if operation is null or empty and attach cmisselect=repositoryInfo and some code optimazion


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@134987 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
This commit is contained in:
Alan Davis
2017-02-07 15:07:57 +00:00
parent e563162e41
commit 7d6523d611

View File

@@ -473,24 +473,16 @@ public class CMISHttpServletRequest implements HttpServletRequest
if(networkId != null && networkId.length() > 0) if(networkId != null && networkId.length() > 0)
{ {
if (reqQueryString == null) if (reqQueryString != null)
{ {
queryString.append("repositoryId="); queryString.append(reqQueryString + "&");
queryString.append(networkId);
} }
else queryString.append("repositoryId=" + networkId);
{ if(operation == null || operation.isEmpty())
queryString.append(reqQueryString);
queryString.append("&repositoryId=");
queryString.append(networkId);
}
String cmisselector = httpReq.getParameter("cmisselector");
if(cmisselector == null || cmisselector.isEmpty())
{ {
queryString.append("&cmisselector="); queryString.append("&cmisselector=");
queryString.append(Constants.SELECTOR_REPOSITORY_INFO); queryString.append(Constants.SELECTOR_REPOSITORY_INFO);
} }
return queryString.toString(); return queryString.toString();
} }
return reqQueryString; return reqQueryString;