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

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

Browse Source 
93246: Merged 5.0.N (5.0.1) to HEAD-BUG-FIX (5.1/Cloud)
      93128: Merged V4.2-BUG-FIX (4.2.5) to 5.0.N (5.0.1)
         93076: Merged V4.1-BUG-FIX (4.1.10) to V4.2-BUG-FIX (4.2.5)
            92995: Merged DEV to V4.1-BUG-FIX (4.1.10)
               92749 : MNT-12835 : bad management of SMTP 4XX errors leading to a "java.lang.OutOfMemoryError: Java heap space" error
                  - Do not provide MailException to logger.error to avoid MainExcepetion.printStackTrace of wrapped messages


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@94944 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
This commit is contained in:
Alan Davis
2015-01-31 12:14:16 +00:00
parent 5c2620ad78
commit 4912765624
1 changed files with 2 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
source/java/org/alfresco/repo/action/executer/MailActionExecuter.java
View File

@@ -996,14 +996,13 @@ public class MailActionExecuter extends ActionExecuterAbstractBase
}
// always log the failure
logger.error("Failed to send email to " + to, e);
logger.error("Failed to send email to " + to + " : " + e);
// optionally ignore the throwing of the exception
Boolean ignoreError = (Boolean)ruleAction.getParameterValue(PARAM_IGNORE_SEND_FAILURE);
if (ignoreError == null || ignoreError.booleanValue() == false)
{
Object[] args = {to, e.toString()};
throw new AlfrescoRuntimeException("email.outbound.err.send.failed", args, e);
throw new AlfrescoRuntimeException("Failed to send email to:" + to);
}
}
}