From 08b0f1f668ba1346f2be74c7a232edfbd689fc5a Mon Sep 17 00:00:00 2001 From: Gary Spencer Date: Tue, 17 Jan 2006 14:47:38 +0000 Subject: [PATCH] Fixed problem where the MS Word renames during document save lose the original mime-type. git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@2128 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261 --- .../filesys/smb/server/repo/CifsHelper.java | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) diff --git a/source/java/org/alfresco/filesys/smb/server/repo/CifsHelper.java b/source/java/org/alfresco/filesys/smb/server/repo/CifsHelper.java index b910f0939d..8a49c82798 100644 --- a/source/java/org/alfresco/filesys/smb/server/repo/CifsHelper.java +++ b/source/java/org/alfresco/filesys/smb/server/repo/CifsHelper.java @@ -507,13 +507,14 @@ public class CifsHelper String mimetype = mimetypeService.guessMimetype(tempName); oldContentData = ContentData.setMimetype(null, mimetype); } - ContentData newContentData = fileToMoveInfo.getContentData(); - if (newContentData == null) - { - String mimetype = mimetypeService.guessMimetype(newName); - newContentData = ContentData.setMimetype(null, mimetype); - } + ContentData newContentData = fileToMoveInfo.getContentData(); + + // Reset the mime type + + String mimetype = mimetypeService.guessMimetype(newName); + newContentData = ContentData.setMimetype(newContentData, mimetype); + nodeService.setProperty(tempNodeRef, ContentModel.PROP_CONTENT, newContentData); nodeService.setProperty(nodeToMoveRef, ContentModel.PROP_CONTENT, oldContentData); }