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

Outbound email - protected against testMessageTo being null

Browse Source 
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@47456 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
This commit is contained in:
Mark Rogers
2013-03-01 17:46:13 +00:00
parent 3373456c13
commit 583ddc80ee
2 changed files with 17 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
config/alfresco/messages/email-service.properties
View File

@@ -25,3 +25,7 @@ email.server.err.failed_to_read_content_stream=Failed to read the message part c
email.server.err.incorrect_message_part=Incorrect message part: {0} email.server.err.incorrect_message_part=Incorrect message part: {0}
email.outbound.err.send.failed=Failed to send email to: {0} cause {1} email.outbound.err.send.failed=Failed to send email to: {0} cause {1}
email.outbound.err.test.no.to=Unable to send test message 'testMessageTo' is empty
email.outbound.err.test.no.subject=Unable to send test message 'subject' is empty
email.outbound.err.test.no.text=Unable to send test message 'text' is empty

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

@@ -271,6 +271,18 @@ public class MailActionExecuter extends ActionExecuterAbstractBase
*/ */
public boolean sendTestMessage() public boolean sendTestMessage()
{ {
if(testMessageTo == null || testMessageTo.length() == 0)
{
throw new AlfrescoRuntimeException("email.outbound.err.test.no.to");
}
if(testMessageSubject == null || testMessageSubject.length() == 0)
{
throw new AlfrescoRuntimeException("email.outbound.err.test.no.subject");
}
if(testMessageText == null || testMessageText.length() == 0)
{
throw new AlfrescoRuntimeException("email.outbound.err.test.no.text");
}
Map<String, Serializable> params = new HashMap<String, Serializable>(); Map<String, Serializable> params = new HashMap<String, Serializable>();
params.put(PARAM_TO, testMessageTo); params.put(PARAM_TO, testMessageTo);
params.put(PARAM_SUBJECT, testMessageSubject); params.put(PARAM_SUBJECT, testMessageSubject);
@@ -314,7 +326,7 @@ public class MailActionExecuter extends ActionExecuterAbstractBase
numberFailedSends.set(0); numberFailedSends.set(0);
super.init(); super.init();
if (sendTestMessage) if (sendTestMessage && testMessageTo != null)
{ {
Map<String, Serializable> params = new HashMap<String, Serializable>(); Map<String, Serializable> params = new HashMap<String, Serializable>();
params.put(PARAM_TO, testMessageTo); params.put(PARAM_TO, testMessageTo);