Merged DEV/THOR1 to HEAD

32945: Fix for ALF-12122 Some CMIS queries with SOLR are not returning correct results

git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@32958 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
This commit is contained in:
Andrew Hind
2011-12-22 19:46:51 +00:00
parent 5ce0bb8fe4
commit f1958f3c9f

View File

@@ -26,11 +26,13 @@ import java.util.Set;
import org.alfresco.model.WCMModel;
import org.alfresco.repo.avm.AVMNodeConverter;
import org.alfresco.repo.domain.PropertyValue;
import org.alfresco.repo.tenant.TenantService;
import org.alfresco.repo.web.scripts.FileTypeImageUtils;
import org.alfresco.service.cmr.avm.AVMNodeDescriptor;
import org.alfresco.service.cmr.avm.LayeringDescriptor;
import org.alfresco.service.cmr.dictionary.DataTypeDefinition;
import org.alfresco.service.cmr.repository.Path;
import org.alfresco.service.cmr.repository.Path.Element;
import org.alfresco.service.cmr.workflow.WorkflowTask;
import org.alfresco.service.namespace.QName;
import org.alfresco.wcm.asset.AssetInfo;
@@ -92,6 +94,12 @@ public class AVMNode extends Node implements Map<String, Object>
result.append(new Path.Element()
{
public String getElementString() { return s2; }
@Override
public Element getBaseNameElement(TenantService tenantService)
{
return this;
}
});
}
}