From fbc5fad70463ff4f4a61b4410ef9122062bf6237 Mon Sep 17 00:00:00 2001
From: Ancuta Morarasu <ancuta.morarasu@ness.com>
Date: Wed, 11 May 2016 10:49:56 +0000
Subject: [PATCH] Merged HEAD (5.2) to 5.2.N (5.2.1)    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
---
 source/java/org/alfresco/rest/api/model/Node.java | 10 ++++++++--
 1 file changed, 8 insertions(+), 2 deletions(-)

diff --git a/source/java/org/alfresco/rest/api/model/Node.java b/source/java/org/alfresco/rest/api/model/Node.java
index f9adaa0097..cb36057614 100644
--- a/source/java/org/alfresco/rest/api/model/Node.java
+++ b/source/java/org/alfresco/rest/api/model/Node.java
@@ -149,7 +149,12 @@ public class Node implements Comparable<Node>
     }
 
     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);
         }
@@ -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)
     {
         this.guid = guid;
+        setId(guid.toString());
     }
 
     /**