Author: norman Date: Sun Sep 25 09:23:17 2011 New Revision: 1175345 URL: http://svn.apache.org/viewvc?rev=1175345&view=rev Log: LineHandler and ConnectHandler now return Response. See PROTOCOLS-34
Modified: james/server/trunk/lmtpserver/src/main/java/org/apache/james/lmtpserver/DataLineLMTPMessageHookHandler.java Modified: james/server/trunk/lmtpserver/src/main/java/org/apache/james/lmtpserver/DataLineLMTPMessageHookHandler.java URL: http://svn.apache.org/viewvc/james/server/trunk/lmtpserver/src/main/java/org/apache/james/lmtpserver/DataLineLMTPMessageHookHandler.java?rev=1175345&r1=1175344&r2=1175345&view=diff ============================================================================== --- james/server/trunk/lmtpserver/src/main/java/org/apache/james/lmtpserver/DataLineLMTPMessageHookHandler.java (original) +++ james/server/trunk/lmtpserver/src/main/java/org/apache/james/lmtpserver/DataLineLMTPMessageHookHandler.java Sun Sep 25 09:23:17 2011 @@ -36,6 +36,7 @@ import org.apache.james.mailbox.MailboxE import org.apache.james.mailbox.MailboxManager; import org.apache.james.mailbox.MailboxPath; import org.apache.james.mailbox.MailboxSession; +import org.apache.james.protocols.api.Response; import org.apache.james.protocols.api.handler.LineHandler; import org.apache.james.protocols.smtp.SMTPResponse; import org.apache.james.protocols.smtp.SMTPRetCode; @@ -66,7 +67,7 @@ public class DataLineLMTPMessageHookHand } @SuppressWarnings("unchecked") - public void onLine(SMTPSession session, byte[] line, LineHandler<SMTPSession> next) { + public Response onLine(SMTPSession session, byte[] line, LineHandler<SMTPSession> next) { MimeMessageInputStreamSource mmiss = (MimeMessageInputStreamSource) session.getState().get(SMTPConstants.DATA_MIMEMESSAGE_STREAMSOURCE); try { @@ -124,9 +125,11 @@ public class DataLineLMTPMessageHookHand SMTPResponse response = new SMTPResponse(SMTPRetCode.LOCAL_ERROR, DSNStatus.getStatus(DSNStatus.TRANSIENT, DSNStatus.UNDEFINED_STATUS) + " Error processing message: " + e.getMessage()); session.getLogger().error("Unknown error occurred while processing DATA.", e); - session.writeResponse(response); - return; + return response; } + + // TODO: Fix me as we should better return the response all the time + return null; } /** --------------------------------------------------------------------- To unsubscribe, e-mail: server-dev-unsubscr...@james.apache.org For additional commands, e-mail: server-dev-h...@james.apache.org