inteligr8/alfresco-community-repo
1
0
Fork 0
mirror of https://github.com/Alfresco/alfresco-community-repo.git synced 2025-10-08 14:51:49 +00:00
Code Issues Packages Projects Releases Wiki Activity

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

Browse Source 
121797 rneamtu: Merged 5.0.N (5.0.4) to 5.1.N (5.1.1)
      121765 nsmintanca: Merged V4.2-BUG-FIX (4.2.7) to 5.0.N (5.0.4)
         121735 rneamtu: 121670: MNT-13814 : Using MS word Save As pdf does not work correctly.
            - Fixed failing test


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@123652 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
This commit is contained in:
Alan Davis
2016-03-11 21:43:05 +00:00
parent 05fd2f8800
commit 42bc4fcb7d
1 changed files with 1 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
source/java/org/alfresco/repo/content/AbstractContentWriter.java
View File

@@ -617,7 +617,7 @@ public abstract class AbstractContentWriter extends AbstractContentAccessor impl
private void doGuessMimetype(String filename) private void doGuessMimetype(String filename)
{ {
String mimetype; String mimetype;
if (filename.startsWith(MimetypeMap.MACOS_RESOURCE_FORK_FILE_NAME_PREFIX)) if (filename != null && filename.startsWith(MimetypeMap.MACOS_RESOURCE_FORK_FILE_NAME_PREFIX))
{ {
mimetype = MimetypeMap.MIMETYPE_APPLEFILE; mimetype = MimetypeMap.MIMETYPE_APPLEFILE;
} }