inteligr8/alfresco-community-repo
1
0
Fork 0
mirror of https://github.com/Alfresco/alfresco-community-repo.git synced 2025-08-21 18:09:20 +00:00
Code Issues Packages Projects Releases Wiki Activity

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

Browse Source 
126371 jkaabimofrad: Merged FILE-FOLDER-API (5.2.0) to HEAD (5.2)
      119810 jvonka: FileFolder API - fix TestFavourites fallout (due to unexpected id:null -> NPE) after adding some NodeApiTests


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/BRANCHES/DEV/5.2.N/root@126716 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
This commit is contained in:
Ancuta Morarasu
2016-05-11 10:49:56 +00:00
parent 935c4cc5b0
commit fbc5fad704
1 changed files with 8 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -149,7 +149,12 @@ public class Node implements Comparable<Node>
} }
private NodeRef getStringAsNodeRef(String nRefString) { private NodeRef getStringAsNodeRef(String nRefString) {
if(! NodeRef.isNodeRef(nRefString)) if (nRefString == null)
{
return null;
}
if( ! NodeRef.isNodeRef(nRefString))
{ {
return new NodeRef(StoreRef.STORE_REF_WORKSPACE_SPACESSTORE, nRefString); return new NodeRef(StoreRef.STORE_REF_WORKSPACE_SPACESSTORE, nRefString);
} }
@@ -328,11 +333,12 @@ public class Node implements Comparable<Node>
} }
/** /**
* @deprecated * @deprecated note: used when creating (via POST) favourite target
*/ */
public void setGuid(NodeRef guid) public void setGuid(NodeRef guid)
{ {
this.guid = guid; this.guid = guid;
setId(guid.toString());
} }
/** /**