Merged 5.1.N (5.1.1) to HEAD (5.1)

121796 rneamtu: Merged 5.0.N (5.0.4) to 5.1.N (5.1.1)
      121764 nsmintanca: Merged V4.2-BUG-FIX (4.2.7) to 5.0.N (5.0.4)
         121709 rneamtu: Merged DEV to V4.2-BUG-FIX (4.2.7)
            121670 rneamtu: MNT-13814 : Using MS word Save As pdf does not work correctly.
               - Added new mimetype "application/applefile" and set it for files that starts with "._"
               - Added new test for case


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@123651 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
This commit is contained in:
Alan Davis
2016-03-11 21:42:56 +00:00
parent 678273be01
commit 05fd2f8800
3 changed files with 149 additions and 5 deletions

View File

@@ -1,5 +1,5 @@
/*
* Copyright (C) 2005-2010 Alfresco Software Limited.
* Copyright (C) 2005-2016 Alfresco Software Limited.
*
* This file is part of Alfresco
*
@@ -613,11 +613,18 @@ public abstract class AbstractContentWriter extends AbstractContentAccessor impl
guessingOnCloseListener.filename = filename;
}
}
private void doGuessMimetype(String filename)
{
String mimetype = mimetypeService.guessMimetype(
filename, getReader()
);
String mimetype;
if (filename.startsWith(MimetypeMap.MACOS_RESOURCE_FORK_FILE_NAME_PREFIX))
{
mimetype = MimetypeMap.MIMETYPE_APPLEFILE;
}
else
{
mimetype = mimetypeService.guessMimetype(filename, getReader());
}
setMimetype(mimetype);
}