From 824391d8589b9a7e5197d82f912b92b81e5c459c Mon Sep 17 00:00:00 2001
From: Alan Davis <alan.davis@alfresco.com>
Date: Fri, 14 Mar 2014 16:47:25 +0000
Subject: [PATCH] Merged HEAD-BUG-FIX (4.3/Cloud) to HEAD (4.3/Cloud)    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
---
 .../opencmis/mapping/DescriptionProperty.java     | 15 ++++++++++++++-
 1 file changed, 14 insertions(+), 1 deletion(-)

diff --git a/source/java/org/alfresco/opencmis/mapping/DescriptionProperty.java b/source/java/org/alfresco/opencmis/mapping/DescriptionProperty.java
index 19b695fb66..8a635ae701 100644
--- a/source/java/org/alfresco/opencmis/mapping/DescriptionProperty.java
+++ b/source/java/org/alfresco/opencmis/mapping/DescriptionProperty.java
@@ -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