Merged 5.2.N (5.2.2) to HEAD (5.2)

134826 cturlica: CLD-3: Trunk broken by Servlet API upgrade on platform
      - partial revert of refactoring done in REPO-908


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@137369 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
This commit is contained in:
Andrei Rebegea
2017-06-14 17:00:41 +00:00
parent 8c1a017df7
commit 5a13a06076

View File

@@ -203,7 +203,7 @@ public class PeopleImpl implements People
return personId; return personId;
} }
protected void processPersonProperties(final Map<QName, Serializable> nodeProps) protected void processPersonProperties(String userName, final Map<QName, Serializable> nodeProps)
{ {
if(!contentUsageService.getEnabled()) if(!contentUsageService.getEnabled())
{ {
@@ -376,7 +376,7 @@ public class PeopleImpl implements People
if (personNode != null) if (personNode != null)
{ {
Map<QName, Serializable> nodeProps = nodeService.getProperties(personNode); Map<QName, Serializable> nodeProps = nodeService.getProperties(personNode);
processPersonProperties(nodeProps); processPersonProperties(personId, nodeProps);
// TODO this needs to be run as admin but should we do this here? // TODO this needs to be run as admin but should we do this here?
final String pId = personId; final String pId = personId;
Boolean enabled = AuthenticationUtil.runAsSystem(new RunAsWork<Boolean>() Boolean enabled = AuthenticationUtil.runAsSystem(new RunAsWork<Boolean>()