From 113501c9a1c9bb5beff2ed5de0113a96c9c3c65f Mon Sep 17 00:00:00 2001 From: Dave Ward Date: Thu, 14 Jul 2011 13:08:53 +0000 Subject: [PATCH] Merged V3.4-BUG-FIX to HEAD 28997: ALF-9400 / ALF-7940: handle the absence of a property value in CMIS web services by setting the property to null (consistent with REST apis) 29000: ALF-6293: More verbose logging when installing services on Linux - Fix from Bitrock 29003: ALF-9490: Removed overriden strings from the preBuildActionList that were stopping the correct translations from being picked up! - Plus extra strings externalized by Bitrock 29013: ALF-9361: CLONE -sync Flat IMAP client with Alfresco is slow and inaccurate Missed a binding of the beforeDeleteNode behaviour. 29023: Fix compilation error git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@29029 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261 --- .../org/alfresco/repo/cmis/ws/utils/PropertyUtil.java | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/source/java/org/alfresco/repo/cmis/ws/utils/PropertyUtil.java b/source/java/org/alfresco/repo/cmis/ws/utils/PropertyUtil.java index 1287c672dc..cb72a26867 100644 --- a/source/java/org/alfresco/repo/cmis/ws/utils/PropertyUtil.java +++ b/source/java/org/alfresco/repo/cmis/ws/utils/PropertyUtil.java @@ -246,9 +246,9 @@ public class PropertyUtil { value = (convertedValue.size() > 0) ? new ArrayList((convertedValue)) : (null); } - else + else if (!convertedValue.isEmpty()) { - value = (Serializable)convertedValue.iterator().next(); + value = (Serializable) convertedValue.iterator().next(); } } @@ -338,7 +338,11 @@ public class PropertyUtil if (null != cmisProperty) { String pdid = getPropertyName(cmisProperty); - properties.put(pdid, getValue(cmisProperty)); + Serializable value = getValue(cmisProperty); + if (value != null) + { + properties.put(pdid, value); + } } }