Author: echatellier Date: 2014-07-22 16:35:54 +0200 (Tue, 22 Jul 2014) New Revision: 432 Url: http://forge.codelutin.com/projects/faxtomail/repository/revisions/432 Log: Fix message. Modified: trunk/faxtomail-ui-web/src/main/java/com/franciaflex/faxtomail/web/job/MailFilterJob.java Modified: trunk/faxtomail-ui-web/src/main/java/com/franciaflex/faxtomail/web/job/MailFilterJob.java =================================================================== --- trunk/faxtomail-ui-web/src/main/java/com/franciaflex/faxtomail/web/job/MailFilterJob.java 2014-07-21 09:59:26 UTC (rev 431) +++ trunk/faxtomail-ui-web/src/main/java/com/franciaflex/faxtomail/web/job/MailFilterJob.java 2014-07-22 14:35:54 UTC (rev 432) @@ -372,16 +372,23 @@ } if (Boolean.TRUE.equals(reject)) { - // unknown client -> message rejected - String recipient = email.getSender(); - if (email.isFax()) { - recipient = FaxToMailServiceUtils.addFaxDomainToFaxNumber(recipient, mailFolder); + + if (StringUtils.isBlank(senderEmail) || StringUtils.isBlank(rejectMessage)) { + if (log.isWarnEnabled()) { + log.warn("Can't send reject message due to invalid configuration"); + } + } else { + // unknown client -> message rejected + String recipient = email.getSender(); + if (email.isFax()) { + recipient = FaxToMailServiceUtils.addFaxDomainToFaxNumber(recipient, mailFolder); + } + emailService.rejectEmail(senderEmail, recipient, t("faxtomail.email.subject.re", message.getSubject()), rejectMessage); + + // important, delete mail + deleteMail(message); } - emailService.rejectEmail(senderEmail, recipient, t("faxtomail.email.subject.re", message.getSubject()), rejectMessage); - // important, delete mail - deleteMail(message); - continue; } }