This is an automated email from the ASF dual-hosted git repository. btellier pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/james-project.git
commit 69cfb923920a6a6d833d7f6223fb1523230f5fcc Author: Benoit Tellier <[email protected]> AuthorDate: Sun Jan 30 22:08:55 2022 +0700 [REFACTORING] VacationAction: error handling returning null The last of the code base! Was throwing a NPE... This can safely be skipped. --- .../org/apache/james/transport/mailets/jsieve/VacationAction.java | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) 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 bef3040..c8f41a4 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 @@ -88,18 +88,18 @@ public class VacationAction implements MailAction { Set<MailAddress> currentMailAddresses = ImmutableSet.copyOf(mail.getRecipients()); Set<MailAddress> allowedMailAddresses = Stream .concat( - actionVacation.getAddresses().stream().map(s -> retrieveAddressFromString(s, context)), + actionVacation.getAddresses().stream().flatMap(this::retrieveAddressFromString), Stream.of(context.getRecipient())) .collect(ImmutableSet.toImmutableSet()); return !Sets.intersection(currentMailAddresses, allowedMailAddresses).isEmpty(); } - private MailAddress retrieveAddressFromString(String address, ActionContext context) { + private Stream<MailAddress> retrieveAddressFromString(String address) { try { - return new MailAddress(address); + return Stream.of(new MailAddress(address)); } catch (AddressException e) { LOGGER.warn("Mail address {} was not well formatted : {}", address, e.getLocalizedMessage()); - return null; + return Stream.empty(); } } --------------------------------------------------------------------- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
