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

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

Browse Source 
126359 jkaabimofrad: Merged FILE-FOLDER-API (5.2.0) to HEAD (5.2)
      119631 jvonka: RA-639: FileFolder API - update node info (metadata) - add &/or remove aspects
      - TODO add tests (across the board)


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/BRANCHES/DEV/5.2.N/root@126705 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
This commit is contained in:
Ancuta Morarasu
2016-05-11 10:47:50 +00:00
parent 78a2510b8d
commit 2997aa5bfe
2 changed files with 56 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
source/java/org/alfresco/rest/api/model/Node.java
View File

@@ -114,7 +114,7 @@ public class Node implements Comparable<Node>
public static UserInfo lookupUserInfo(String userName, Map<String, UserInfo> mapUserInfo, PersonService personService) {
UserInfo userInfo = mapUserInfo.get(userName);
if (userInfo == null)
if ((userInfo == null) && (userName != null))
{
String sysUserName = AuthenticationUtil.getSystemUserName();
if (userName.equals(sysUserName) || (AuthenticationUtil.isMtEnabled() && userName.startsWith(sysUserName + "@")))