From 42bc4fcb7daa271bff37fa792dccab6d08f546ad Mon Sep 17 00:00:00 2001 From: Alan Davis Date: Fri, 11 Mar 2016 21:43:05 +0000 Subject: [PATCH] Merged 5.1.N (5.1.1) to HEAD (5.1) 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 --- .../java/org/alfresco/repo/content/AbstractContentWriter.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/source/java/org/alfresco/repo/content/AbstractContentWriter.java b/source/java/org/alfresco/repo/content/AbstractContentWriter.java index b49f195d9d..0d26e7411b 100644 --- a/source/java/org/alfresco/repo/content/AbstractContentWriter.java +++ b/source/java/org/alfresco/repo/content/AbstractContentWriter.java @@ -617,7 +617,7 @@ public abstract class AbstractContentWriter extends AbstractContentAccessor impl private void doGuessMimetype(String filename) { 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; }