From f1958f3c9f353ef45f3df3fc0f587a5e7fb9be4b Mon Sep 17 00:00:00 2001
From: Andrew Hind <andy.hind@alfresco.com>
Date: Thu, 22 Dec 2011 19:46:51 +0000
Subject: [PATCH] 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
---
 source/java/org/alfresco/web/bean/wcm/AVMNode.java | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/source/java/org/alfresco/web/bean/wcm/AVMNode.java b/source/java/org/alfresco/web/bean/wcm/AVMNode.java
index 8dc5345d7c..871054070f 100644
--- a/source/java/org/alfresco/web/bean/wcm/AVMNode.java
+++ b/source/java/org/alfresco/web/bean/wcm/AVMNode.java
@@ -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;
+                    }
                   });
                }
             }