This is an automated email from the git hooks/post-receive script. New commit to branch develop in repository faxtomail. See https://gitlab.nuiton.org/codelutin/faxtomail.git commit 6fd22ea7c712b470ad727a50911f652f78ff38e3 Author: jcouteau <couteau@codelutin.com> Date: Fri Mar 26 16:02:16 2021 +0100 Ne pas créer de doublon en cas d'erreur d'envoi d'accusé de réception --- .../franciaflex/faxtomail/web/job/MailFilterJob.java | 20 +++++++++++++------- 1 file changed, 13 insertions(+), 7 deletions(-) diff --git a/faxtomail-ui-web/src/main/java/com/franciaflex/faxtomail/web/job/MailFilterJob.java b/faxtomail-ui-web/src/main/java/com/franciaflex/faxtomail/web/job/MailFilterJob.java index 7be37940..d39dcc17 100644 --- a/faxtomail-ui-web/src/main/java/com/franciaflex/faxtomail/web/job/MailFilterJob.java +++ b/faxtomail-ui-web/src/main/java/com/franciaflex/faxtomail/web/job/MailFilterJob.java @@ -43,6 +43,7 @@ import org.apache.commons.lang3.BooleanUtils; import org.apache.commons.lang3.StringUtils; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; +import org.apache.commons.mail.EmailException; import org.nuiton.decorator.Decorator; import org.nuiton.util.FileUtil; import org.quartz.DisallowConcurrentExecution; @@ -257,11 +258,11 @@ public class MailFilterJob extends AbstractFaxToMailJob { })); // try to find the real recipient, in case it is in the bcc -> Check Received headers - Enumeration allHeaders = message.getAllHeaders(); + Enumeration<Header> allHeaders = message.getAllHeaders(); String regex = "^.*for<(.*)>.*$"; while (allHeaders.hasMoreElements()) { - Header header = (Header) allHeaders.nextElement(); + Header header = allHeaders.nextElement(); if ("Received".equals(header.getName())) { String forRecipient = StringUtils.removePattern(header.getValue(), "\\s"); @@ -550,11 +551,16 @@ public class MailFilterJob extends AbstractFaxToMailJob { if (log.isDebugEnabled()) { log.debug("Send acknowledgement to " + recipient); } - emailService.sendHtmlEmail(acknowledgementMailAddress, - recipient, - t("faxtomail.email.subject.re", message.getSubject()), - acknowledgementMessage, - rootFolder.getAcknowledgementSigning()); + + try { + emailService.sendHtmlEmail(acknowledgementMailAddress, + recipient, + t("faxtomail.email.subject.re", message.getSubject()), + acknowledgementMessage, + rootFolder.getAcknowledgementSigning()); + } catch (EmailException eee) { + log.warn("Error sending acknowledgement to " + recipient + "(" + eee.getMessage()+")"); + } } } -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@codelutin.com>.