mirror of
https://github.com/Alfresco/alfresco-community-repo.git
synced 2025-08-07 17:49:17 +00:00
Merged HEAD-BUG-FIX (5.1/Cloud) to HEAD (5.0/Cloud)
85821: Merged V4.2-BUG-FIX (4.2.4) to HEAD-BUG-FIX (5.0/Cloud) 85774: Merged DEV to V4.2-BUG-FIX (4.2.4) 85761: MNT-12381 IMAP server does not respect RFC for failed SELECT - The new AlfrescoImapRuntimeException was added. Greenmail FolderException exceptions will be thrown instead of AlfrescoRuntimeException in AlfrescoImapHostManager.getFolder() method with throws declaration. git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@94518 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
This commit is contained in:
@@ -26,6 +26,7 @@ import java.util.List;
|
||||
import java.util.Map;
|
||||
|
||||
import org.alfresco.repo.imap.exception.AlfrescoImapFolderException;
|
||||
import org.alfresco.repo.imap.exception.AlfrescoImapRuntimeException;
|
||||
import org.alfresco.util.Utf7;
|
||||
import org.apache.commons.logging.Log;
|
||||
import org.apache.commons.logging.LogFactory;
|
||||
@@ -246,7 +247,22 @@ public class AlfrescoImapHostManager implements ImapHostManager
|
||||
public MailFolder getFolder(final GreenMailUser user, final String mailboxName, boolean mustExist)
|
||||
throws FolderException
|
||||
{
|
||||
return getFolder(user, mailboxName);
|
||||
try
|
||||
{
|
||||
return getFolder(user, mailboxName);
|
||||
}
|
||||
catch (AlfrescoImapRuntimeException e)
|
||||
{
|
||||
if (!mustExist)
|
||||
{
|
||||
return null;
|
||||
}
|
||||
else if (e.getCause() instanceof FolderException)
|
||||
{
|
||||
throw (FolderException) e.getCause();
|
||||
}
|
||||
throw e;
|
||||
}
|
||||
}
|
||||
|
||||
/**
|
||||
|
Reference in New Issue
Block a user