Merged BRANCHES/DEV/V4.0-BUG-FIX to HEAD:

33789: ALF-12714 Avoid warning for null date properties when converting metadata extracted properties to Content Model ones (other types produce no warning, was only a date issue)
   33796: ALF-12714 FFMpeg can do video thumbnails for 3GPP files, can turn them into MP4 Video. Also, enable Audio MP4 -> MP3 transformation.
   33798: ALF-12714 Mark M4A/M4B (MP4 Audio) as audio based


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@33799 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
This commit is contained in:
Nick Burch
2012-02-09 12:19:56 +00:00
parent c3b86192d6
commit c1da83b23d
3 changed files with 66 additions and 0 deletions

View File

@@ -823,6 +823,10 @@ abstract public class AbstractMappingMetadataExtracter implements MetadataExtrac
{
convertedPropertyValue = makeDate((String) propertyValue);
}
else if (propertyValue == null)
{
convertedPropertyValue = null;
}
else
{
if (logger.isWarnEnabled())