Spring/spring-integration
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

INT-1039, Fixed missing assertion on MailMessage.to value

Browse Source
This commit is contained in:
Oleg Zhurakousky
2010-03-16 02:56:29 +00:00
parent 203cadc600
commit a915e95c01
2 changed files with 36 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
org.springframework.integration.mail/src/main/java/org/springframework/integration/mail/MailSendingMessageHandler.java
View File

@@ -47,6 +47,7 @@ import org.springframework.util.StringUtils;
*
* @author Marius Bogoevici
* @author Mark Fisher
* @author Oleg Zhurakousky
*/
public class MailSendingMessageHandler implements MessageHandler {
@@ -127,7 +128,9 @@ public class MailSendingMessageHandler implements MessageHandler {
mailMessage.setSubject(subject);
}
String[] to = this.retrieveHeaderValueAsStringArray(headers, MailHeaders.TO);
mailMessage.setTo(to);
if (to != null){
mailMessage.setTo(to);
}
if (mailMessage instanceof SimpleMailMessage) {
Assert.state(!ObjectUtils.isEmpty(((SimpleMailMessage) mailMessage).getTo()),
"No recipient has been provided on the MailMessage or the 'MailHeaders.TO' header.");
@@ -152,15 +155,18 @@ public class MailSendingMessageHandler implements MessageHandler {
private String[] retrieveHeaderValueAsStringArray(MessageHeaders headers, String key) {
Object value = headers.get(key);
String[] returnedHeaders = null;
if (value != null) {
if (value instanceof String[]) {
return (String[]) value;
}
if (value instanceof String) {
return StringUtils.commaDelimitedListToStringArray((String) value);
}
returnedHeaders = (String[]) value;
} else if (value instanceof String) {
returnedHeaders = StringUtils.commaDelimitedListToStringArray((String) value);
}
}
return null;
if (returnedHeaders == null || ObjectUtils.isEmpty(returnedHeaders)){
returnedHeaders = null;
}
return returnedHeaders;
}
}