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

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

View File

@@ -30,6 +30,8 @@ import org.alfresco.repo.imap.exception.AlfrescoImapFolderException;
import org.alfresco.repo.transaction.RetryingTransactionHelper;
import org.alfresco.repo.transaction.RetryingTransactionHelper.RetryingTransactionCallback;
import org.alfresco.service.ServiceRegistry;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
import com.icegreen.greenmail.foedus.util.MsgRangeFilter;
import com.icegreen.greenmail.mail.MovingMessage;
@@ -48,6 +50,8 @@ public abstract class AbstractImapFolder implements MailFolder
{
private List<FolderListener> listeners = new LinkedList<FolderListener>();
protected Log logger = LogFactory.getLog(getClass());
protected ServiceRegistry serviceRegistry;
protected static int MAX_RETRIES = 20;
@@ -453,6 +457,12 @@ public abstract class AbstractImapFolder implements MailFolder
catch (Exception e)
{
Throwable cause = e.getCause();
if (logger.isDebugEnabled())
{
logger.debug("Exception is thrown : " + e + "\nCause : " + cause);
}
String message;
if (cause != null)
{