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

Merged 5.1.N (5.1.2) to 5.2.N (5.2.1)

Browse Source 
125832 rmunteanu: Merged 5.0.N (5.0.4) to 5.1.N (5.1.2)
      125670 abalmus: MNT-16188 : [Kerberos] Users Search doesn't work
         MNT-15038 : Unexpected behavior when disabling Active Directory user (New feature to sync userAccountControl)
            - Fixed NPE in AuthenticationServiceImpl.getAuthenticationEnabled (I guess sometimes the PersonService bean is not injected)


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/BRANCHES/DEV/5.2.N/root@125865 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
This commit is contained in:
Andreea Dragoi
2016-04-27 12:28:45 +00:00
parent c2ba8ebbea
commit 17f25f685c
1 changed files with 1 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
source/java/org/alfresco/repo/security/authentication/AuthenticationServiceImpl.java
View File

@@ -344,7 +344,7 @@ public class AuthenticationServiceImpl extends AbstractAuthenticationService imp
*/
public boolean getAuthenticationEnabled(String userName) throws AuthenticationException
{
if (personService.personExists(userName))
if (personService != null && personService.personExists(userName))
{
return personService.isEnabled(userName);
}