From 34c8dba387946c6f7fa069aae1cc35ff88a77431 Mon Sep 17 00:00:00 2001 From: Alan Davis Date: Sat, 31 Jan 2015 11:47:18 +0000 Subject: [PATCH] Merged HEAD-BUG-FIX (5.1/Cloud) to HEAD (5.1/Cloud) 92322: Merged 5.0.N (5.0.1) to HEAD-BUG-FIX (5.1/Cloud) 92223: Merged V4.2-BUG-FIX (4.2.5) to 5.0.N (5.0.1) 92126: Merged DEV (4.2.4) to V4.2-BUG-FIX (4.2.5) 90326: MNT-12534: Javascript Mail action does not handle the subjectParams parameter Changed MailActionExecuter to use subject parameters as List. git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@94867 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261 --- .../alfresco/repo/action/executer/MailActionExecuter.java | 6 +++--- 1 file changed, 3 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 fa71103af2..bbf0b5a1ca 100644 --- a/source/java/org/alfresco/repo/action/executer/MailActionExecuter.java +++ b/source/java/org/alfresco/repo/action/executer/MailActionExecuter.java @@ -884,8 +884,8 @@ public class MailActionExecuter extends ActionExecuterAbstractBase // set subject line String subject = (String)ruleAction.getParameterValue(PARAM_SUBJECT); - Object[] subjectParams = (Object[])ruleAction.getParameterValue(PARAM_SUBJECT_PARAMS); - String localizedSubject = getLocalizedSubject(subject, subjectParams, locale); + List subjectParams = (List)ruleAction.getParameterValue(PARAM_SUBJECT_PARAMS); + String localizedSubject = getLocalizedSubject(subject, subjectParams.toArray(), locale); if (locale == null) { // process the template against the model @@ -954,7 +954,7 @@ public class MailActionExecuter extends ActionExecuterAbstractBase } catch (Exception e) { // We're forced to catch java.lang.Exception here. Urgh. - if (logger.isInfoEnabled()) + if (logger.isWarnEnabled()) { logger.warn("Unable to prepare mail message. Skipping.", e); }