Reverse merged HEAD (5.2)

<< This commit was made for cloud 45. Change made to the wrong brtanch >>
         134895 cturlica: Merged 5.2.N (5.2.1) 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@134896 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
This commit is contained in:
Alan Davis
2017-02-02 16:14:46 +00:00
parent 0c9ec7d3a9
commit 6bfcd3a2d4

View File

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