From 7f03b263baab0982899e7eda9d86bc1e95698803 Mon Sep 17 00:00:00 2001
From: Martin Muller <martin.muller@alfresco.com>
Date: Wed, 25 Jan 2017 12:55:22 +0000
Subject: [PATCH] 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/BRANCHES/DEV/5.2.N/root@134753 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
---
 .../opencmis/CMISHttpServletRequest.java         | 16 ++++------------
 1 file changed, 4 insertions(+), 12 deletions(-)

diff --git a/source/java/org/alfresco/opencmis/CMISHttpServletRequest.java b/source/java/org/alfresco/opencmis/CMISHttpServletRequest.java
index 71f69889bf..9a7ea910df 100644
--- a/source/java/org/alfresco/opencmis/CMISHttpServletRequest.java
+++ b/source/java/org/alfresco/opencmis/CMISHttpServletRequest.java
@@ -473,24 +473,16 @@ public class CMISHttpServletRequest implements HttpServletRequest
 
         if(networkId != null && networkId.length() > 0)
         {
-            if (reqQueryString == null)
+            if (reqQueryString != null)
             {
-                queryString.append("repositoryId=");
-                queryString.append(networkId);
+	            queryString.append(reqQueryString + "&");
             }
-            else
-            {
-                queryString.append(reqQueryString);
-                queryString.append("&repositoryId=");
-                queryString.append(networkId);
-            }
-            String cmisselector = httpReq.getParameter("cmisselector");
-            if(cmisselector == null || cmisselector.isEmpty())
+	        queryString.append("repositoryId=" + networkId);
+            if(operation == null || operation.isEmpty())
             {
             	queryString.append("&cmisselector=");
 	            queryString.append(Constants.SELECTOR_REPOSITORY_INFO);
             }
-            
             return queryString.toString();
         }
         return reqQueryString;