Merge from SEAMIST3

git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@10730 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
This commit is contained in:
David Caruana
2008-09-04 11:08:13 +00:00
parent d894798ee4
commit ae909e7413
45 changed files with 4443 additions and 2171 deletions

View File

@@ -28,6 +28,7 @@ import java.io.Serializable;
import org.alfresco.cmis.dictionary.CMISMapping;
import org.alfresco.cmis.dictionary.CMISScope;
import org.alfresco.service.cmr.repository.ChildAssociationRef;
import org.alfresco.service.cmr.repository.NodeRef;
/**
@@ -41,7 +42,15 @@ public class ParentPropertyAccessor extends AbstractNamedPropertyAccessor
public Serializable getProperty(NodeRef nodeRef)
{
return getServiceRegistry().getNodeService().getPrimaryParent(nodeRef).getParentRef();
ChildAssociationRef car = getServiceRegistry().getNodeService().getPrimaryParent(nodeRef);
if((car != null) && (car.getParentRef() != null))
{
return car.getParentRef().toString();
}
else
{
return null;
}
}