JAMES-1854 ResetReturnPath is always true
Project: http://git-wip-us.apache.org/repos/asf/james-project/repo Commit: http://git-wip-us.apache.org/repos/asf/james-project/commit/e2550e2c Tree: http://git-wip-us.apache.org/repos/asf/james-project/tree/e2550e2c Diff: http://git-wip-us.apache.org/repos/asf/james-project/diff/e2550e2c Branch: refs/heads/master Commit: e2550e2c44e1dd947d8110e05a387b1a472cc049 Parents: 7d31184 Author: Benoit Tellier <[email protected]> Authored: Thu Oct 27 16:39:25 2016 +0200 Committer: Benoit Tellier <[email protected]> Committed: Fri Nov 18 18:46:46 2016 +0700 ---------------------------------------------------------------------- .../mailets/delivery/LocalDelivery.java | 1 - .../transport/mailets/delivery/SieveMailet.java | 33 ++++++-------------- .../mailets/delivery/ToRecipientFolder.java | 1 - .../mailets/delivery/SieveMailetTest.java | 1 - 4 files changed, 10 insertions(+), 26 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/james-project/blob/e2550e2c/server/mailet/mailets/src/main/java/org/apache/james/transport/mailets/delivery/LocalDelivery.java ---------------------------------------------------------------------- diff --git a/server/mailet/mailets/src/main/java/org/apache/james/transport/mailets/delivery/LocalDelivery.java b/server/mailet/mailets/src/main/java/org/apache/james/transport/mailets/delivery/LocalDelivery.java index b592354..9fcc785 100644 --- a/server/mailet/mailets/src/main/java/org/apache/james/transport/mailets/delivery/LocalDelivery.java +++ b/server/mailet/mailets/src/main/java/org/apache/james/transport/mailets/delivery/LocalDelivery.java @@ -119,7 +119,6 @@ public class LocalDelivery extends GenericMailet { .resourceLocator(ResourceLocatorImpl.instanciate(usersRepository, sieveRepository)) .consume(getInitParameter("consume", true)) .deliveryHeader("Delivered-To") - .resetReturnPath(true) .quiet(getInitParameter("quiet", false)) .verbose(getInitParameter("verbose", false)) .folder("INBOX") http://git-wip-us.apache.org/repos/asf/james-project/blob/e2550e2c/server/mailet/mailets/src/main/java/org/apache/james/transport/mailets/delivery/SieveMailet.java ---------------------------------------------------------------------- diff --git a/server/mailet/mailets/src/main/java/org/apache/james/transport/mailets/delivery/SieveMailet.java b/server/mailet/mailets/src/main/java/org/apache/james/transport/mailets/delivery/SieveMailet.java index 2b4bdc4..14415d4 100644 --- a/server/mailet/mailets/src/main/java/org/apache/james/transport/mailets/delivery/SieveMailet.java +++ b/server/mailet/mailets/src/main/java/org/apache/james/transport/mailets/delivery/SieveMailet.java @@ -78,7 +78,6 @@ public class SieveMailet extends GenericMailet implements Poster { private String folder; private ResourceLocator resourceLocator; private String deliveryHeader; - private boolean resetReturnPath; private boolean consume; private Optional<Boolean> verbose = Optional.absent(); private Optional<Boolean> quiet = Optional.absent(); @@ -108,11 +107,6 @@ public class SieveMailet extends GenericMailet implements Poster { return this; } - public Builder resetReturnPath(boolean resetReturnPath) { - this.resetReturnPath = resetReturnPath; - return this; - } - public Builder verbose(boolean verbose) { this.verbose = Optional.of(verbose); return this; @@ -132,7 +126,7 @@ public class SieveMailet extends GenericMailet implements Poster { if (resourceLocator == null) { throw new MailetException("Not initialised. Please ensure that the mailet container supports either setter or constructor injection"); } - return new SieveMailet(usersRepos,mailboxManager, resourceLocator, folder, deliveryHeader, resetReturnPath, consume, verbose.or(false), quiet.or(false)); + return new SieveMailet(usersRepos, mailboxManager, resourceLocator, folder, deliveryHeader, consume, verbose.or(false), quiet.or(false)); } } @@ -142,7 +136,6 @@ public class SieveMailet extends GenericMailet implements Poster { private final String folder; private final ResourceLocator resourceLocator; private final String deliveryHeader; - private final boolean resetReturnPath; private final boolean isInfo; private final boolean verbose; private final boolean consume; @@ -151,7 +144,7 @@ public class SieveMailet extends GenericMailet implements Poster { private final Log log; private SieveMailet(UsersRepository usersRepos, MailboxManager mailboxManager, ResourceLocator resourceLocator, String folder, String deliveryHeader, - boolean resetReturnPath, boolean consume, boolean verbose, boolean quiet) throws MessagingException { + boolean consume, boolean verbose, boolean quiet) throws MessagingException { this.usersRepos = usersRepos; this.resourceLocator = resourceLocator; @@ -159,7 +152,6 @@ public class SieveMailet extends GenericMailet implements Poster { this.folder = folder; this.actionDispatcher = new ActionDispatcher(); this.deliveryHeader = deliveryHeader; - this.resetReturnPath = resetReturnPath; this.consume = consume; this.isInfo = verbose || !quiet; this.verbose = verbose; @@ -342,20 +334,15 @@ public class SieveMailet extends GenericMailet implements Poster { Collection<MailAddress> recipients = mail.getRecipients(); Collection<MailAddress> errors = new Vector<MailAddress>(); - MimeMessage message = null; - if (deliveryHeader != null || resetReturnPath) { - message = mail.getMessage(); - } + MimeMessage message = mail.getMessage(); - if (resetReturnPath) { - // Set Return-Path and remove all other Return-Path headers from the - // message - // This only works because there is a placeholder inserted by - // MimeMessageWrapper - message.setHeader(RFC2822Headers.RETURN_PATH, - (mail.getSender() == null ? "<>" : "<" + mail.getSender() - + ">")); - } + // Set Return-Path and remove all other Return-Path headers from the + // message + // This only works because there is a placeholder inserted by + // MimeMessageWrapper + message.setHeader(RFC2822Headers.RETURN_PATH, + (mail.getSender() == null ? "<>" : "<" + mail.getSender() + + ">")); Enumeration headers; InternetHeaders deliveredTo = new InternetHeaders(); http://git-wip-us.apache.org/repos/asf/james-project/blob/e2550e2c/server/mailet/mailets/src/main/java/org/apache/james/transport/mailets/delivery/ToRecipientFolder.java ---------------------------------------------------------------------- diff --git a/server/mailet/mailets/src/main/java/org/apache/james/transport/mailets/delivery/ToRecipientFolder.java b/server/mailet/mailets/src/main/java/org/apache/james/transport/mailets/delivery/ToRecipientFolder.java index 36744f0..fa8242d 100644 --- a/server/mailet/mailets/src/main/java/org/apache/james/transport/mailets/delivery/ToRecipientFolder.java +++ b/server/mailet/mailets/src/main/java/org/apache/james/transport/mailets/delivery/ToRecipientFolder.java @@ -97,7 +97,6 @@ public class ToRecipientFolder extends GenericMailet { .resourceLocator(ResourceLocatorImpl.instanciate(usersRepository, sieveRepository)) .deliveryHeader("Delivered-To") .folder(getInitParameter(FOLDER_PARAMETER, "INBOX")) - .resetReturnPath(true) .consume(getInitParameter(CONSUME_PARAMETER, false)) .verbose(getInitParameter("verbose", false)) .quiet(getInitParameter("quiet", true)) http://git-wip-us.apache.org/repos/asf/james-project/blob/e2550e2c/server/mailet/mailets/src/test/java/org/apache/james/transport/mailets/delivery/SieveMailetTest.java ---------------------------------------------------------------------- diff --git a/server/mailet/mailets/src/test/java/org/apache/james/transport/mailets/delivery/SieveMailetTest.java b/server/mailet/mailets/src/test/java/org/apache/james/transport/mailets/delivery/SieveMailetTest.java index 0e29313..4155f46 100644 --- a/server/mailet/mailets/src/test/java/org/apache/james/transport/mailets/delivery/SieveMailetTest.java +++ b/server/mailet/mailets/src/test/java/org/apache/james/transport/mailets/delivery/SieveMailetTest.java @@ -109,7 +109,6 @@ public class SieveMailetTest { .resourceLocator(resourceLocator) .folder("INBOX") .deliveryHeader("DELIVERY_HEADER") - .resetReturnPath(true) .consume(true) .build(); } --------------------------------------------------------------------- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
