From c1b4e119c1626d0d494b14e44369b059aee3f4a2 Mon Sep 17 00:00:00 2001 From: Kevin Roast Date: Thu, 30 Jul 2009 08:46:18 +0000 Subject: [PATCH] Merged V3.2 to HEAD 15358: Merged V3.1 to V3.2 15356: Fix for ETHREEOH-2561 15417: Fix for ETHREEOH-2437 - use 'write' webscript transaction to create Calendar container on first refresh. 15480: Merged V3.1 to V3.2 15479: Fix to unreported issue with JS search API. 15481: Fix to unreported XSS issue in Add As Favourite site functionality. 15482: Maxresults value now passed into underlying search API in search lib JS for improved performance executing large searches in Share. git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@15483 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261 --- source/java/org/alfresco/repo/jscript/Search.java | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/source/java/org/alfresco/repo/jscript/Search.java b/source/java/org/alfresco/repo/jscript/Search.java index 7354e6c5a9..fc88be97ff 100644 --- a/source/java/org/alfresco/repo/jscript/Search.java +++ b/source/java/org/alfresco/repo/jscript/Search.java @@ -315,13 +315,13 @@ public class Search extends BaseScopableProcessorExtension { return Context.getCurrentContext().newArray(getScope(), 0); } - if (sortColumn == null || sortColumn.length() == 0) - { - return luceneSearch(store, search); - } - SortColumn[] sort = new SortColumn[1]; - sort[0] = new SortColumn(sortColumn, asc); + SortColumn[] sort = null; + if (sortColumn != null && sortColumn.length() != 0) + { + sort = new SortColumn[1]; + sort[0] = new SortColumn(sortColumn, asc); + } Object[] results = query(store, search, sort, SearchService.LANGUAGE_LUCENE, max, 0); return Context.getCurrentContext().newArray(getScope(), results); }