inteligr8/alfresco-community-repo
1
0
Fork 0
mirror of https://github.com/Alfresco/alfresco-community-repo.git synced 2025-10-15 15:02:20 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merged HEAD (5.1) to 5.1.N (5.1.1)

Browse Source 
120786 amukha: Merged AMUKHA/PLAT-HEAD-2016-01-11 (5.1) to HEAD (5.1)
      120772 amukha: ACE-4909: [Win 10, Chrome] - Site Members: Searching users with two chars results in wrapped exception
         - Added a check if the tenant is disabled;
         - Added JUnit test for disabled tenant and for deleted tenant.


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/BRANCHES/DEV/5.1.N/root@120848 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
This commit is contained in:
Alexandra Leahu
2016-01-13 14:49:36 +00:00
parent 13fa587a76
commit 4e38d63177
2 changed files with 52 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
source/java/org/alfresco/repo/security/authentication/RepositoryAuthenticationDao.java
View File

@@ -38,6 +38,7 @@ import org.alfresco.repo.node.NodeServicePolicies.BeforeDeleteNodePolicy;
import org.alfresco.repo.node.NodeServicePolicies.OnUpdatePropertiesPolicy;
import org.alfresco.repo.policy.JavaBehaviour;
import org.alfresco.repo.policy.PolicyComponent;
import org.alfresco.repo.tenant.TenantDisabledException;
import org.alfresco.repo.tenant.TenantService;
import org.alfresco.repo.tenant.TenantUtil;
import org.alfresco.repo.transaction.RetryingTransactionHelper.RetryingTransactionCallback;
@@ -374,7 +375,22 @@ public class RepositoryAuthenticationDao implements MutableAuthenticationDao, In
private NodeRef getUserFolderLocation(String caseSensitiveUserName)
{
NodeRef userNodeRef = singletonCache.get((tenantService.getUserDomain(caseSensitiveUserName) + KEY_USERFOLDER_NODEREF));
String userDomain = null;
try
{
userDomain = tenantService.getUserDomain(caseSensitiveUserName);
}
catch (TenantDisabledException tde)
{
// see ACE-4909
// it is normal at this part if the tenant is disabled
}
if (userDomain == null)
{
// try to use default domain
userDomain = TenantService.DEFAULT_DOMAIN;
}
NodeRef userNodeRef = singletonCache.get(userDomain + KEY_USERFOLDER_NODEREF);
if (userNodeRef == null)
{
QName qnameAssocSystem = QName.createQName("sys", "system", namespacePrefixResolver);