Index: server/protocols/protocols-smtp/src/main/java/org/apache/james/smtpserver/fastfail/SPFHandler.java IDEA additional info: Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP <+>UTF-8 =================================================================== diff --git a/server/protocols/protocols-smtp/src/main/java/org/apache/james/smtpserver/fastfail/SPFHandler.java b/server/protocols/protocols-smtp/src/main/java/org/apache/james/smtpserver/fastfail/SPFHandler.java --- a/server/protocols/protocols-smtp/src/main/java/org/apache/james/smtpserver/fastfail/SPFHandler.java (revision 34f9b0b52ab8c84378d3a34ac43a0fef5aa4e8fe) +++ b/server/protocols/protocols-smtp/src/main/java/org/apache/james/smtpserver/fastfail/SPFHandler.java (date 1638194428623) @@ -117,7 +117,7 @@ * SMTP session object */ private void doSPFCheck(SMTPSession session, MaybeSender sender) { - Optional heloEhlo = session.getAttachment(SMTPSession.CURRENT_HELO_NAME, State.Transaction); + Optional heloEhlo = session.getAttachment(SMTPSession.CURRENT_HELO_NAME, State.Connection); // We have no Sender or HELO/EHLO yet return false if (sender.isNullSender() || !heloEhlo.isPresent()) {