Merged 5.2.N (5.2.1) to HEAD (5.2)

129192 mmuller: Merged RETURN-OF-THE-API (5.2.0) to 5.2.N (5.2.1)
      129037 adavis: REPO-243 People Live Search
         - Added another orderBy test following a question from Jan.
         - Minor change in post order code to replace a Map lookup with a List lookup. Logically the same but faster.
         - Replaced a NPE test failure with a failure message if TEST_COUNT is too small


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@129366 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
This commit is contained in:
Alexandru Epure
2016-08-09 14:16:32 +00:00
parent 175bda1980
commit 139f3137b4
2 changed files with 27 additions and 4 deletions

View File

@@ -556,9 +556,10 @@ public class QueriesImpl implements Queries, InitializingBean
public int compare(NodeRef n1, NodeRef n2)
{
int result = 0;
for (SortColumn sortCol : sortCols)
for (int i=0; i<sortCols.size(); i++)
{
QName sortPropQName = sortParamsToQNames.get(sortCol.column);
SortColumn sortCol = sortCols.get(i);
QName sortPropQName = sortPropQNames.get(i);
Serializable p1 = getProperty(n1, sortPropQName);
Serializable p2 = getProperty(n2, sortPropQName);