From a3f60b6596c23309fa34742d342a80b64337fcb8 Mon Sep 17 00:00:00 2001 From: Derek Hulley Date: Tue, 9 Jul 2013 13:49:12 +0000 Subject: [PATCH] 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 --- .../java/org/alfresco/repo/tenant/MultiTServiceImpl.java | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/source/java/org/alfresco/repo/tenant/MultiTServiceImpl.java b/source/java/org/alfresco/repo/tenant/MultiTServiceImpl.java index c5a96ba48e..429a8cfe2a 100644 --- a/source/java/org/alfresco/repo/tenant/MultiTServiceImpl.java +++ b/source/java/org/alfresco/repo/tenant/MultiTServiceImpl.java @@ -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; }