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

Merged V3.4-BUG-FIX to HEAD

Browse Source 
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
This commit is contained in:
Dave Ward
2011-07-14 13:08:53 +00:00
parent 84067ad840
commit 113501c9a1
1 changed files with 7 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
source/java/org/alfresco/repo/cmis/ws/utils/PropertyUtil.java
View File

@@ -246,9 +246,9 @@ public class PropertyUtil
{ {
value = (convertedValue.size() > 0) ? new ArrayList<Object>((convertedValue)) : (null); value = (convertedValue.size() > 0) ? new ArrayList<Object>((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) if (null != cmisProperty)
{ {
String pdid = getPropertyName(cmisProperty); String pdid = getPropertyName(cmisProperty);
properties.put(pdid, getValue(cmisProperty)); Serializable value = getValue(cmisProperty);
if (value != null)
{
properties.put(pdid, value);
}
} }
} }