Merged BRANCHES/V3.3 to HEAD:

20155: Fix ALF-2755: AtomPub create document with versioning state major (and supplied content stream) does not version the content stream, Fix ALF-2756: AtomPub create document with versioning state checkedout cause duplicate name exception
   20161: Fix ALF-2760: AtomPub binding renders aspect multi-valued id properties incorrectly
   20162: FIx ALF-2705: ClassCastException in getProperties()

git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@20163 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
This commit is contained in:
David Caruana
2010-05-10 15:26:19 +00:00
parent d3565f67de
commit c2a0a63f04
3 changed files with 13 additions and 7 deletions

View File

@@ -612,9 +612,13 @@ public class PropertyUtil
if (value instanceof Collection)
{
for (String propertyValue : (Collection<String>) value)
for (Serializable propertyValue : (Collection<Serializable>) value)
{
property.getValue().add(propertyValue);
// NOTE: CMIS multi-valued values cannot contain null
if (propertyValue != null)
{
property.getValue().add(propertyValue.toString());
}
}
}
else