From 491276562428a02338a755971eb4fd7f62a127d8 Mon Sep 17 00:00:00 2001 From: Alan Davis Date: Sat, 31 Jan 2015 12:14:16 +0000 Subject: [PATCH] Merged HEAD-BUG-FIX (5.1/Cloud) to HEAD (5.1/Cloud) 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 --- .../alfresco/repo/action/executer/MailActionExecuter.java | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/source/java/org/alfresco/repo/action/executer/MailActionExecuter.java b/source/java/org/alfresco/repo/action/executer/MailActionExecuter.java index 6d523b60fd..87017ea652 100644 --- a/source/java/org/alfresco/repo/action/executer/MailActionExecuter.java +++ b/source/java/org/alfresco/repo/action/executer/MailActionExecuter.java @@ -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); } } }