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 DEV to HEAD (5.0)

Browse Source 
86271 : ACE-2960 : getRepositories service no longer works for the atom pub binding
      - Do not change -default- to blank string
   86300 : ACE-2960 : getRepositories service no longer works for the atom pub binding 
      - Return reqQueryString if networkId not specified. Test extended with 1.0 and 1.1 versions and browser binding


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@86365 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
This commit is contained in:
Pavel Yurke
2014-10-03 07:15:28 +00:00
parent d2494466ba
commit 67830a004e
2 changed files with 43 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
source/java/org/alfresco/opencmis/CMISHttpServletRequest.java
View File

@@ -36,7 +36,6 @@ import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpSession;
import org.alfresco.opencmis.CMISDispatcherRegistry.Binding;
import org.alfresco.repo.tenant.TenantService;
import org.alfresco.repo.tenant.TenantUtil;
import org.alfresco.repo.web.scripts.TenantWebScriptServletRequest;
import org.alfresco.service.descriptor.Descriptor;
@@ -77,10 +76,6 @@ public class CMISHttpServletRequest implements HttpServletRequest
{
TenantWebScriptServletRequest servletReq = (TenantWebScriptServletRequest)baseReq;
this.networkId = servletReq.getTenant();
if(TenantUtil.DEFAULT_TENANT.equals(this.networkId) || TenantUtil.SYSTEM_TENANT.equals(this.networkId))
{
this.networkId = TenantService.DEFAULT_DOMAIN;
}
}
Match match = req.getServiceMatch();
@@ -438,7 +433,7 @@ public class CMISHttpServletRequest implements HttpServletRequest
StringBuilder queryString = new StringBuilder();
String reqQueryString = httpReq.getQueryString();
if(networkId != null)
if(networkId != null && networkId.length() > 0)
{
if (reqQueryString == null)
{
@@ -455,7 +450,7 @@ public class CMISHttpServletRequest implements HttpServletRequest
}
else
{
return null;
return reqQueryString;
}
}