From 49e29b3472bc43d9914c6e37ec8d7cba436d05e1 Mon Sep 17 00:00:00 2001 From: Alan Davis Date: Thu, 18 Sep 2014 17:20:39 +0000 Subject: [PATCH] Merged HEAD-BUG-FIX (5.0/Cloud) to HEAD (5.0/Cloud) 84026: Merged V4.2-BUG-FIX (4.2.4) to HEAD-BUG-FIX (5.0/Cloud) 82663: Neaten logic for MT domain extraction from username git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@84617 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261 --- .../repo/tenant/MultiTServiceImpl.java | 25 +++++++++++-------- 1 file changed, 14 insertions(+), 11 deletions(-) diff --git a/source/java/org/alfresco/repo/tenant/MultiTServiceImpl.java b/source/java/org/alfresco/repo/tenant/MultiTServiceImpl.java index b953f96c26..f3ced9efe6 100644 --- a/source/java/org/alfresco/repo/tenant/MultiTServiceImpl.java +++ b/source/java/org/alfresco/repo/tenant/MultiTServiceImpl.java @@ -397,19 +397,22 @@ public class MultiTServiceImpl implements TenantService public String getBaseNameUser(String name) { - // can be null (e.g. for System user / during app ctx init) - // We only bother with MT username@domain format if MT is enabled - if (name != null && isEnabled()) + if (name == null || !isEnabled()) { - int idx = name.lastIndexOf(SEPARATOR); - if (idx != -1) - { - return name.substring(0, idx); - // tenant domain doesn't exists but we are allowed to create - // no base name can be resolved for such users -> return - } + // Can be null (e.g. for System user / during app ctx init) + // The name is the name and we don't care about the domain part + return name; + } + // We only bother with MT username@domain format if MT is enabled + int idx = name.lastIndexOf(SEPARATOR); + if (idx != -1) + { + return name.substring(0, idx); + } + else + { + return name; } - return name; } @Override