From 0f69ce51fedc38b18353644b25b2d5e64a4d25cd Mon Sep 17 00:00:00 2001 From: Mark Rogers Date: Sat, 20 Sep 2014 10:56:42 +0000 Subject: [PATCH] Merged HEAD-BUG-FIX (5.0/Cloud) to HEAD (5.0/Cloud) 85093: Merged PLATFORM1 (5.0/Cloud) to HEAD-BUG-FIX (5.0/Cloud) 84714: Fixed NPE when spellcheck def is not present in search. git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@85408 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261 --- source/java/org/alfresco/repo/jscript/Search.java | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/source/java/org/alfresco/repo/jscript/Search.java b/source/java/org/alfresco/repo/jscript/Search.java index e193d6b8c3..31690a85d9 100644 --- a/source/java/org/alfresco/repo/jscript/Search.java +++ b/source/java/org/alfresco/repo/jscript/Search.java @@ -587,8 +587,10 @@ public class Search extends BaseScopableProcessorExtension implements Initializi String defaultField = (String)def.get("defaultField"); String defaultOperator = (String)def.get("defaultOperator"); String searchTerm = (String) def.get("searchTerm"); - boolean spellCheck = (boolean) def.get("spellCheck"); - + Object spellCheckObject = def.get("spellCheck"); + boolean spellCheck = (spellCheckObject == null) ? false : (boolean) spellCheckObject; + + // extract supplied values // sorting columns