Merged HEAD-BUG-FIX (5.1/Cloud) to HEAD (5.1/Cloud)

108039: Merged 5.0.N (5.0.3) to HEAD-BUG-FIX (5.1/Cloud)
      107604: Merged V4.2-BUG-FIX (4.2.5) to 5.0.N (5.0.3)
         107379: Merged DEV to V4.2-BUG-FIX (4.2.5)
            100688 : MNT-13713 : row.getValue() returns null when indexing with lucene and sort is applied.
               - Was implemented some code for query with sorting.
            107250 : MNT-13713 : row.getValue() returns null when indexing with lucene and sort is applied.
               - Added a test


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@108070 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
This commit is contained in:
Alan Davis
2015-07-09 22:09:53 +00:00
parent 65aa48b800
commit b34aaa4cfe
3 changed files with 63 additions and 9 deletions

View File

@@ -1,5 +1,5 @@
/*
* Copyright (C) 2005-2010 Alfresco Software Limited.
* Copyright (C) 2005-2015 Alfresco Software Limited.
*
* This file is part of Alfresco
*
@@ -214,6 +214,11 @@ public class SortedResultSet implements ResultSet
return resultSet.getResultSetMetaData();
}
public NodeService getNodeService()
{
return nodeService;
}
public ResultSetRow getRow(int i)
{
if (i < length())

View File

@@ -18,11 +18,13 @@
*/
package org.alfresco.repo.search.results;
import java.io.Serializable;
import java.util.Map;
import org.alfresco.repo.search.AbstractResultSetRow;
import org.alfresco.service.cmr.repository.NodeRef;
import org.alfresco.service.cmr.search.ResultSetRow;
import org.alfresco.service.namespace.QName;
/**
* @author andyh
@@ -60,8 +62,11 @@ public class SortedResultSetRow extends AbstractResultSetRow implements ResultSe
throw new UnsupportedOperationException();
}
protected Map<QName, Serializable> getDirectProperties()
{
SortedResultSet srs = (SortedResultSet) getResultSet();
return srs.getNodeService().getProperties(srs.getNodeRef(getIndex()));
}