From 0bc48ce88240f59e5dd0863d34691816599b2cd7 Mon Sep 17 00:00:00 2001
From: Alan Davis <alan.davis@alfresco.com>
Date: Sat, 31 Jan 2015 11:47:27 +0000
Subject: [PATCH] Merged HEAD-BUG-FIX (5.1/Cloud) to HEAD (5.1/Cloud)    92323:
 Merged 5.0.N (5.0.1) to HEAD-BUG-FIX (5.1/Cloud)       92224: Merged
 V4.2-BUG-FIX (4.2.5) to 5.0.N (5.0.1)          92166: MNT-12534: Javascript
 Mail action does not handle the subjectParams parameter          Added a
 check for null parameters.

git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@94868 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
---
 .../org/alfresco/repo/action/executer/MailActionExecuter.java    | 1 +
 1 file changed, 1 insertion(+)

diff --git a/source/java/org/alfresco/repo/action/executer/MailActionExecuter.java b/source/java/org/alfresco/repo/action/executer/MailActionExecuter.java
index bbf0b5a1ca..6d523b60fd 100644
--- a/source/java/org/alfresco/repo/action/executer/MailActionExecuter.java
+++ b/source/java/org/alfresco/repo/action/executer/MailActionExecuter.java
@@ -885,6 +885,7 @@ public class MailActionExecuter extends ActionExecuterAbstractBase
                     // set subject line
                     String subject = (String)ruleAction.getParameterValue(PARAM_SUBJECT);
                     List<Object> subjectParams = (List<Object>)ruleAction.getParameterValue(PARAM_SUBJECT_PARAMS);
+                    subjectParams = subjectParams == null ? new ArrayList<Object>() : subjectParams;
                     String localizedSubject = getLocalizedSubject(subject, subjectParams.toArray(), locale);
                     if (locale == null)
                     {