inteligr8/alfresco-community-repo
1
0
Fork 0
mirror of https://github.com/Alfresco/alfresco-community-repo.git synced 2025-08-07 17:49:17 +00:00
Code Issues Packages Projects Releases Wiki Activity

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

Browse Source 
63705: Merged V4.2-BUG-FIX (4.2.2) to HEAD-BUG-FIX (4.3.0.BF)
      63639: MNT-10161 : cmis:description is not mapped properly for CMIS 1.1 compliance
         - Test failure fix


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@64316 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
This commit is contained in:
Alan Davis
2014-03-14 16:47:25 +00:00
parent 63b50a15c2
commit 824391d858
1 changed files with 14 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
source/java/org/alfresco/opencmis/mapping/DescriptionProperty.java
View File

@@ -48,7 +48,20 @@ public class DescriptionProperty extends AbstractProperty
@Override
public Serializable getValueInternal(CMISNodeInfo nodeInfo)
{
return getServiceRegistry().getNodeService().getProperty(nodeInfo.getNodeRef(), ContentModel.PROP_DESCRIPTION);
if (nodeInfo.getNodeRef() != null)
{
return getServiceRegistry().getNodeService().getProperty(
nodeInfo.getNodeRef(),
ContentModel.PROP_DESCRIPTION);
}
else if (nodeInfo.getAssociationRef() != null)
{
return getServiceRegistry().getNodeService().getProperty(
nodeInfo.getAssociationRef().getSourceRef(),
ContentModel.PROP_DESCRIPTION);
}
return null;
}
@Override