Merged DEV to HEAD

52184: ALF-19172: MT: Remove checkTenantEnabled for every call to getCurrentUserDomain
          - It is quite possible (especially in tests) for a user to be running a tenant context
            against a tenant that has been disabled or deleted.
          - It seems that the check for tenancy status should be done at a high level i.e. as part of security checks
            or when actually switching into the tenant context


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@52286 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
This commit is contained in:
Derek Hulley 2013-07-09 13:49:12 +00:00
parent e4cd0465bb
commit a3f60b6596

View File

@ -657,10 +657,10 @@ public class MultiTServiceImpl implements TenantService
public String getCurrentUserDomain()
{
String tenantDomain = TenantUtil.getCurrentDomain();
if (! tenantDomain.equals(TenantService.DEFAULT_DOMAIN))
{
checkTenantEnabled(tenantDomain);
}
// if (! tenantDomain.equals(TenantService.DEFAULT_DOMAIN))
// {
// checkTenantEnabled(tenantDomain);
// }
return tenantDomain;
}