From badd76e80d805d73e3a67d4e5a2dae1959e2615d Mon Sep 17 00:00:00 2001 From: Will Abson Date: Wed, 25 Jun 2014 15:35:27 +0000 Subject: [PATCH] Merged HEAD-BUG-FIX (5.0/Cloud) to HEAD (4.3/Cloud) 71857: Merged V4.2-BUG-FIX (4.2.3) to HEAD-BUG-FIX (4.3/Cloud) 71852: MNT-11233: Merged DEV to V4.2-BUG-FIX (4.2.3) 71850: MNT-11233: Alfresco CMIS API /alfresco/api/-default-/cmis/versions/1.1/atom cannot be used with external authentication - Fix remoteUserMapper checking to be the same as in BaseAuthenticationFilter git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@74727 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261 --- .../org/alfresco/rest/api/PublicApiAuthenticatorFactory.java | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/source/java/org/alfresco/rest/api/PublicApiAuthenticatorFactory.java b/source/java/org/alfresco/rest/api/PublicApiAuthenticatorFactory.java index eaf4070783..160b62a9db 100644 --- a/source/java/org/alfresco/rest/api/PublicApiAuthenticatorFactory.java +++ b/source/java/org/alfresco/rest/api/PublicApiAuthenticatorFactory.java @@ -165,7 +165,8 @@ public class PublicApiAuthenticatorFactory extends BasicHttpAuthenticatorFactory String userId = null; // If the remote user mapper is configured, we may be able to map in an externally authenticated user - if (remoteUserMapper != null && !(remoteUserMapper instanceof ActivateableBean) || ((ActivateableBean) remoteUserMapper).isActive()) + if (remoteUserMapper != null + && (!(remoteUserMapper instanceof ActivateableBean) || ((ActivateableBean) remoteUserMapper).isActive())) { userId = remoteUserMapper.getRemoteUser(this.servletReq.getHttpServletRequest()); }