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 bcaebd416d20d3d4b0e2cc7c60f3e4fe4cfd2803 Author: Benoit Tellier <[email protected]> AuthorDate: Fri Nov 26 17:48:47 2021 +0700 JAMES-3676 SendMailHandler should manage all errors upon enqueue Otherwise the SMTP channel is left in a dandling state leading to: java.lang.RuntimeException: 'org.apache.james.core.DataCmdHandler.DATA_MIMEMESSAGE_STREAMSOURCE' has not been filled. at org.apache.james.smtpserver.DataLineJamesMessageHookHandler.lambda$onLine$0(DataLineJamesMessageHookHandler.java:79) --- .../util/src/test/java/org/apache/james/util/ReactorUtilsTest.java | 1 - .../src/main/java/org/apache/james/smtpserver/SendMailHandler.java | 3 +-- 2 files changed, 1 insertion(+), 3 deletions(-) diff --git a/server/container/util/src/test/java/org/apache/james/util/ReactorUtilsTest.java b/server/container/util/src/test/java/org/apache/james/util/ReactorUtilsTest.java index ba469da..a549c17 100644 --- a/server/container/util/src/test/java/org/apache/james/util/ReactorUtilsTest.java +++ b/server/container/util/src/test/java/org/apache/james/util/ReactorUtilsTest.java @@ -573,7 +573,6 @@ class ReactorUtilsTest { .hasMessage("Dummy"); } - @Test void givenAFluxOnOneByteShouldConsumeOnlyTheReadBytesAndThePrefetch() throws IOException, InterruptedException { AtomicInteger generateElements = new AtomicInteger(0); diff --git a/server/protocols/protocols-smtp/src/main/java/org/apache/james/smtpserver/SendMailHandler.java b/server/protocols/protocols-smtp/src/main/java/org/apache/james/smtpserver/SendMailHandler.java index ea82d37..e57de24 100644 --- a/server/protocols/protocols-smtp/src/main/java/org/apache/james/smtpserver/SendMailHandler.java +++ b/server/protocols/protocols-smtp/src/main/java/org/apache/james/smtpserver/SendMailHandler.java @@ -22,7 +22,6 @@ package org.apache.james.smtpserver; import java.io.IOException; import javax.inject.Inject; -import javax.mail.MessagingException; import org.apache.commons.configuration2.Configuration; import org.apache.james.protocols.smtp.SMTPSession; @@ -73,7 +72,7 @@ public class SendMailHandler implements JamesMessageHook { try { queue.enQueue(mail); LOGGER.info("Successfully spooled mail {} from {} on {} for {}", mail.getName(), mail.getMaybeSender(), session.getRemoteAddress().getAddress(), mail.getRecipients()); - } catch (MessagingException me) { + } catch (Exception me) { LOGGER.error("Unknown error occurred while processing DATA.", me); return HookResult.builder() .hookReturnCode(HookReturnCode.denySoft()) --------------------------------------------------------------------- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
