mirror of
https://github.com/Alfresco/alfresco-community-repo.git
synced 2025-08-21 18:09:20 +00:00
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
This commit is contained in:
@@ -246,9 +246,9 @@ public class PropertyUtil
|
||||
{
|
||||
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)
|
||||
{
|
||||
String pdid = getPropertyName(cmisProperty);
|
||||
properties.put(pdid, getValue(cmisProperty));
|
||||
Serializable value = getValue(cmisProperty);
|
||||
if (value != null)
|
||||
{
|
||||
properties.put(pdid, value);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
|
Reference in New Issue
Block a user