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

Merged HEAD-BUG-FIX (5.1/Cloud) to HEAD (5.0/Cloud)

Browse Source 
85565: Merged V4.2-BUG-FIX (4.2.4) to HEAD-BUG-FIX (5.0/Cloud)
      85433: Merged DEV to V4.2-BUG-FIX (4.1.4) with unit test
         84722: MNT-12420: Outlook 2011 (MacOS) implements an IMAP move as an APPEND leading to the creation of an EML file
            - Perform copy instead of create on APPEND request when existing node with provided message-id or X-Alfresco-NodeRef-ID can be found 
            - Add Unit test.


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@94502 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
This commit is contained in:
Alan Davis
2015-01-31 09:31:26 +00:00
parent 5716fe7cfa
commit f3928a21cd
2 changed files with 88 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

41
source/java/org/alfresco/repo/imap/AlfrescoImapFolder.java
View File

@@ -317,7 +317,11 @@ public class AlfrescoImapFolder extends AbstractImapFolder implements Serializab
NodeRef sourceNodeRef = extractNodeRef(message);
if (isMoveOperation(sourceNodeRef))
{
uid = moveNode(this.folderInfo, message, flags, sourceNodeRef);
uid = copyOrmoveNode(this.folderInfo, message, flags, sourceNodeRef, true);
}
else if (sourceNodeRef != null)
{
uid = copyOrmoveNode(this.folderInfo, message, flags, sourceNodeRef, false);
}
else
{
@@ -341,13 +345,21 @@ public class AlfrescoImapFolder extends AbstractImapFolder implements Serializab
* @throws FileNotFoundException
*/
@SuppressWarnings("deprecation")
private long moveNode(FileInfo folderInfo, MimeMessage message, Flags flags, NodeRef sourceNodeRef)
private long copyOrmoveNode(FileInfo folderInfo, MimeMessage message, Flags flags, NodeRef sourceNodeRef, boolean move)
throws FileExistsException, FileNotFoundException
{
FileFolderService fileFolderService = serviceRegistry.getFileFolderService();
FileFilterMode.setClient(FileFilterMode.Client.imap);
fileFolderService.setHidden(sourceNodeRef, false);
FileInfo messageFile = fileFolderService.move(sourceNodeRef, folderInfo.getNodeRef(), null);
FileInfo messageFile = null;
if (move)
{
messageFile = fileFolderService.move(sourceNodeRef, folderInfo.getNodeRef(), null);
}
else
{
messageFile = fileFolderService.copy(sourceNodeRef, folderInfo.getNodeRef(), null);
}
final long newMessageUid = (Long) messageFile.getProperties().get(ContentModel.PROP_NODE_DBID);
imapService.setFlag(messageFile, Flag.RECENT, true);
imapService.setFlag(messageFile, Flag.DELETED, false);
@@ -367,6 +379,7 @@ public class AlfrescoImapFolder extends AbstractImapFolder implements Serializab
String uuid = null;
String messageId = null;
NodeRef result = null;
NodeService nodeService = serviceRegistry.getNodeService();
try
{
messageId = message.getMessageID();
@@ -391,6 +404,28 @@ public class AlfrescoImapFolder extends AbstractImapFolder implements Serializab
uuid = messageId;
}
result = new NodeRef(StoreRef.PROTOCOL_WORKSPACE, "SpacesStore", uuid);
if (nodeService.exists(result) == false)
{
result = null;
}
}
if(result == null)
{
//check X-Alfresco-NodeRef-ID header
try
{
uuid = message.getHeader(AlfrescoImapConst.X_ALF_NODEREF_ID)[0];
result = new NodeRef(StoreRef.PROTOCOL_WORKSPACE, "SpacesStore", uuid);
if (nodeService.exists(result) == false)
{
result = null;
}
}
catch (MessagingException e)
{
//Do nothing
}
}
return result;
}