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

Merged HEAD-QA to HEAD (4.2) (including moving test classes into separate folders)

Browse Source 
51903 to 54309 


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@54310 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
This commit is contained in:
Samuel Langlois
2013-08-20 17:17:31 +00:00
parent 0a36e2af67
commit ab4ca7177f
1576 changed files with 36419 additions and 8603 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
source/java/org/alfresco/repo/tenant/MultiTServiceImpl.java
View File

@@ -178,7 +178,7 @@ public class MultiTServiceImpl implements TenantService
{
int idx2 = name.indexOf(SEPARATOR, 1);
String nameDomain = name.substring(1, idx2);
if (! tenantDomain.equals(nameDomain))
if (! tenantDomain.equalsIgnoreCase(nameDomain))
{
throw new AlfrescoRuntimeException("domain mismatch: expected = " + tenantDomain + ", actual = " + nameDomain);
}
@@ -240,7 +240,7 @@ public class MultiTServiceImpl implements TenantService
{
int idx2 = namespace.indexOf(SEPARATOR, 1);
String nameDomain = namespace.substring(1, idx2);
if (! tenantDomain.equals(nameDomain))
if (! tenantDomain.equalsIgnoreCase(nameDomain))
{
throw new AlfrescoRuntimeException("domain mismatch: expected = " + tenantDomain + ", actual = " + nameDomain);
}
@@ -273,7 +273,7 @@ public class MultiTServiceImpl implements TenantService
{
int idx2 = name.indexOf(SEPARATOR, 1);
String nameDomain = name.substring(1, idx2);
if (! tenantDomain.equals(nameDomain))
if (! tenantDomain.equalsIgnoreCase(nameDomain))
{
throw new AlfrescoRuntimeException("domain mismatch: expected = " + tenantDomain + ", actual = " + nameDomain);
}
@@ -431,7 +431,7 @@ public class MultiTServiceImpl implements TenantService
{
String tenantUserDomain = username.substring(idx2+1);
if ((tenantUserDomain == null) || (! tenantDomain.equals(tenantUserDomain)))
if ((tenantUserDomain == null) || (! tenantDomain.equalsIgnoreCase(tenantUserDomain)))
{
throw new TenantDomainMismatchException(tenantDomain, tenantUserDomain);
}
@@ -751,12 +751,8 @@ public class MultiTServiceImpl implements TenantService
protected void checkTenantEnabled(String tenantDomain)
{
Tenant tenant = getTenant(tenantDomain);
if (tenant == null)
{
throw new AlfrescoRuntimeException("Tenant does not exist: " + tenantDomain);
}
// note: System user can access disabled tenants
if (!AuthenticationUtil.isRunAsUserTheSystemUser() && (! tenant.isEnabled()))
if (tenant == null || !AuthenticationUtil.isRunAsUserTheSystemUser() && !tenant.isEnabled())
{
throw new TenantDisabledException(tenantDomain);
}