From 30b26fafee09bcf640475a17300dfa01f099535f Mon Sep 17 00:00:00 2001
From: Gethin James <gethin.james@alfresco.com>
Date: Thu, 15 Dec 2016 13:31:26 +0000
Subject: [PATCH] ACE-5622: Extra null check on version properties

git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/BRANCHES/DEV/5.2.N/root@133733 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
---
 .../org/alfresco/rest/api/search/impl/ResultMapper.java    | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/source/java/org/alfresco/rest/api/search/impl/ResultMapper.java b/source/java/org/alfresco/rest/api/search/impl/ResultMapper.java
index 4220af37fb..0c241beff8 100644
--- a/source/java/org/alfresco/rest/api/search/impl/ResultMapper.java
+++ b/source/java/org/alfresco/rest/api/search/impl/ResultMapper.java
@@ -206,8 +206,11 @@ public class ResultMapper
                 Version v = null;
                 try
                 {
-                    v = nodeVersions.findVersion(frozenNodeRef.getId(),versionLabelId);
-                    aNode = nodes.getFolderOrDocument(v.getFrozenStateNodeRef(), null, null, params.getInclude(), mapUserInfo);
+                    if (frozenNodeRef != null && versionLabelId != null)
+                    {
+                        v = nodeVersions.findVersion(frozenNodeRef.getId(),versionLabelId);
+                        aNode = nodes.getFolderOrDocument(v.getFrozenStateNodeRef(), null, null, params.getInclude(), mapUserInfo);
+                    }
                 }
                 catch (EntityNotFoundException|InvalidNodeRefException e)
                 {