You are viewing a plain text version of this content. The canonical link for it is here.
Posted to server-dev@james.apache.org by ro...@apache.org on 2019/03/08 11:22:02 UTC
[james-project] branch 3.3.x updated: JAMES-2679 Add missing name
to Mails to avoid NPE later
This is an automated email from the ASF dual-hosted git repository.
rouazana pushed a commit to branch 3.3.x
in repository https://gitbox.apache.org/repos/asf/james-project.git
The following commit(s) were added to refs/heads/3.3.x by this push:
new 196e71f JAMES-2679 Add missing name to Mails to avoid NPE later
196e71f is described below
commit 196e71f9fb32cc3aa5ea7d89ba64c2481cccf37f
Author: Matthieu Baechler <ma...@apache.org>
AuthorDate: Wed Mar 6 11:25:07 2019 +0100
JAMES-2679 Add missing name to Mails to avoid NPE later
---
.../java/org/apache/james/transport/mailets/delivery/MailDispatcher.java | 1 +
.../java/org/apache/james/transport/mailets/jsieve/RedirectAction.java | 1 +
.../java/org/apache/james/transport/mailets/jsieve/RejectAction.java | 1 +
.../java/org/apache/james/transport/mailets/jsieve/VacationAction.java | 1 +
4 files changed, 4 insertions(+)
diff --git a/server/mailet/mailets/src/main/java/org/apache/james/transport/mailets/delivery/MailDispatcher.java b/server/mailet/mailets/src/main/java/org/apache/james/transport/mailets/delivery/MailDispatcher.java
index bbc575f..d96894f 100644
--- a/server/mailet/mailets/src/main/java/org/apache/james/transport/mailets/delivery/MailDispatcher.java
+++ b/server/mailet/mailets/src/main/java/org/apache/james/transport/mailets/delivery/MailDispatcher.java
@@ -98,6 +98,7 @@ public class MailDispatcher {
// regarding the details of the failure(s).
// In the future we may wish to address this.
Mail newMail = MailImpl.builder()
+ .name("error-" + mail.getName())
.sender(mail.getMaybeSender())
.recipients(errors)
.mimeMessage(mail.getMessage())
diff --git a/server/mailet/mailets/src/main/java/org/apache/james/transport/mailets/jsieve/RedirectAction.java b/server/mailet/mailets/src/main/java/org/apache/james/transport/mailets/jsieve/RedirectAction.java
index 1df00ca..b836e0a 100644
--- a/server/mailet/mailets/src/main/java/org/apache/james/transport/mailets/jsieve/RedirectAction.java
+++ b/server/mailet/mailets/src/main/java/org/apache/james/transport/mailets/jsieve/RedirectAction.java
@@ -58,6 +58,7 @@ public class RedirectAction implements MailAction {
ActionUtils.detectAndHandleLocalLooping(aMail, context, "redirect");
context.post(MailImpl.builder()
+ .name("redirect-" + aMail.getName())
.sender(aMail.getMaybeSender())
.recipient(new MailAddress(anAction.getAddress()))
.mimeMessage(aMail.getMessage())
diff --git a/server/mailet/mailets/src/main/java/org/apache/james/transport/mailets/jsieve/RejectAction.java b/server/mailet/mailets/src/main/java/org/apache/james/transport/mailets/jsieve/RejectAction.java
index 2e99e3c..75664b5 100644
--- a/server/mailet/mailets/src/main/java/org/apache/james/transport/mailets/jsieve/RejectAction.java
+++ b/server/mailet/mailets/src/main/java/org/apache/james/transport/mailets/jsieve/RejectAction.java
@@ -138,6 +138,7 @@ public class RejectAction implements MailAction {
Address[] recipientAddresses = reply.getAllRecipients();
if (recipientAddresses != null) {
context.post(MailImpl.builder()
+ .name(MailImpl.getId())
.recipients(Arrays.stream(recipientAddresses)
.map(address -> (InternetAddress) address)
.map(Throwing.function(MailAddress::new))
diff --git a/server/mailet/mailets/src/main/java/org/apache/james/transport/mailets/jsieve/VacationAction.java b/server/mailet/mailets/src/main/java/org/apache/james/transport/mailets/jsieve/VacationAction.java
index 80b772d..a46df58 100644
--- a/server/mailet/mailets/src/main/java/org/apache/james/transport/mailets/jsieve/VacationAction.java
+++ b/server/mailet/mailets/src/main/java/org/apache/james/transport/mailets/jsieve/VacationAction.java
@@ -67,6 +67,7 @@ public class VacationAction implements MailAction {
.build();
context.post(MailImpl.builder()
+ .name(MailImpl.getId())
.sender(vacationReply.getSender())
.recipients(vacationReply.getRecipients())
.mimeMessage(vacationReply.getMimeMessage())
---------------------------------------------------------------------
To unsubscribe, e-mail: server-dev-unsubscribe@james.apache.org
For additional commands, e-mail: server-dev-help@james.apache.org