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.1/Cloud)

Browse Source 
92321: Merged 5.0.N (5.0.1) to HEAD-BUG-FIX (5.1/Cloud)
      92221: Merged V4.2-BUG-FIX (4.2.5) to 5.0.N (5.0.1)
         92039: Merged V4.2.1 (4.2.1.18) to V4.2-BUG-FIX (4.2.5)
            91922: MNT-12903 : Outlook 2013: moving a file from a folder to another makes it a EML file
               - Delete delay is configurable. Logging has been added to CommandCallback


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@94866 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
This commit is contained in:
Alan Davis
2015-01-31 11:47:08 +00:00
parent 63d0306f84
commit a27004cb42
5 changed files with 31 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
source/java/org/alfresco/repo/imap/ImapServiceImpl.java
View File

@@ -165,6 +165,7 @@ public class ImapServiceImpl implements ImapService, OnRestoreNodePolicy, OnCrea
private final static Map<QName, Flags.Flag> qNameToFlag;
private final static Map<Flags.Flag, QName> flagToQname;
private long imapServerShuffleMoveDeleteDelay = 5000L;
private static final Timer deleteDelayTimer = new Timer();
private boolean imapServerEnabled = false;
@@ -352,6 +353,11 @@ public class ImapServiceImpl implements ImapService, OnRestoreNodePolicy, OnCrea
{
this.messageHeadersToPersist = headers;
}
public void setImapServerShuffleMoveDeleteDelay(long imapServerShuffleMoveDeleteDelay)
{
this.imapServerShuffleMoveDeleteDelay = imapServerShuffleMoveDeleteDelay;
}
public boolean getImapServerEnabled()
{
@@ -605,6 +611,11 @@ public class ImapServiceImpl implements ImapService, OnRestoreNodePolicy, OnCrea
// This is the transaction-aware service
fileFolderService.delete(nodeRef);
if (logger.isDebugEnabled())
{
logger.debug("Node has been async deleted " + nodeRef);
}
return null;
}
});
@@ -623,7 +634,11 @@ public class ImapServiceImpl implements ImapService, OnRestoreNodePolicy, OnCrea
}
};
// Schedule a real delete 5 seconds after the current time
deleteDelayTimer.schedule(deleteDelayTask, 5000L);
if (logger.isDebugEnabled())
{
logger.debug("Delete timer is scheduled for " + nodeRef);
}
deleteDelayTimer.schedule(deleteDelayTask, imapServerShuffleMoveDeleteDelay);
}
}