From e3b9a10990c6e646721925729ab62faea659905e Mon Sep 17 00:00:00 2001 From: Alan Davis Date: Sat, 4 Jun 2016 12:45:34 +0000 Subject: [PATCH] Merged 5.2.N (5.2.1) to HEAD (5.2) 125865 adragoi: Merged 5.1.N (5.1.2) to 5.2.N (5.2.1) 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/HEAD/root@127824 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261 --- .../repo/security/authentication/AuthenticationServiceImpl.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/source/java/org/alfresco/repo/security/authentication/AuthenticationServiceImpl.java b/source/java/org/alfresco/repo/security/authentication/AuthenticationServiceImpl.java index 9e4b8e30a5..a5eef12131 100644 --- a/source/java/org/alfresco/repo/security/authentication/AuthenticationServiceImpl.java +++ b/source/java/org/alfresco/repo/security/authentication/AuthenticationServiceImpl.java @@ -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); }