From 4fb400be0aeffb3e78dee7230a49805995f7f9a5 Mon Sep 17 00:00:00 2001
From: Gethin James <gethin.james@alfresco.com>
Date: Tue, 6 Sep 2016 14:19:53 +0000
Subject: [PATCH] Merged searchapi (5.2.1) to 5.2.N (5.2.1)    129895 gjames:
 SEARCH-112: Only showing SearchContext if LastIndexedTxId > 0

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

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 7f2934e74e..7972ef300f 100644
--- a/source/java/org/alfresco/rest/api/search/impl/ResultMapper.java
+++ b/source/java/org/alfresco/rest/api/search/impl/ResultMapper.java
@@ -97,7 +97,10 @@ public class ResultMapper
 
         if (jsonResultSet != null)
         {
-            context = new SearchContext(jsonResultSet.getLastIndexedTxId());
+            if (jsonResultSet.getLastIndexedTxId() > 0)
+            {
+                context = new SearchContext(jsonResultSet.getLastIndexedTxId());
+            }
         }
 
         return CollectionWithPagingInfo.asPaged(searchQuery.getPaging(), noderesults, noderesults.size() + skip < total, total, null, context);