You are viewing a plain text version of this content. The canonical link for it is here.
Posted to server-dev@james.apache.org by no...@apache.org on 2010/12/10 19:29:36 UTC
svn commit: r1044470 - in
/james/protocols/trunk/smtp/src/main/java/org/apache/james/protocols/smtp/core:
MailCmdHandler.java UnknownCmdHandler.java
Author: norman
Date: Fri Dec 10 18:29:35 2010
New Revision: 1044470
URL: http://svn.apache.org/viewvc?rev=1044470&view=rev
Log:
replace tabs with spaces
Modified:
james/protocols/trunk/smtp/src/main/java/org/apache/james/protocols/smtp/core/MailCmdHandler.java
james/protocols/trunk/smtp/src/main/java/org/apache/james/protocols/smtp/core/UnknownCmdHandler.java
Modified: james/protocols/trunk/smtp/src/main/java/org/apache/james/protocols/smtp/core/MailCmdHandler.java
URL: http://svn.apache.org/viewvc/james/protocols/trunk/smtp/src/main/java/org/apache/james/protocols/smtp/core/MailCmdHandler.java?rev=1044470&r1=1044469&r2=1044470&view=diff
==============================================================================
--- james/protocols/trunk/smtp/src/main/java/org/apache/james/protocols/smtp/core/MailCmdHandler.java (original)
+++ james/protocols/trunk/smtp/src/main/java/org/apache/james/protocols/smtp/core/MailCmdHandler.java Fri Dec 10 18:29:35 2010
@@ -50,21 +50,24 @@ public class MailCmdHandler extends Abst
*/
private Map<String, MailParametersHook> paramHooks;
-
/*
* (non-Javadoc)
- * @see org.apache.james.smtpserver.protocol.core.AbstractHookableCmdHandler#onCommand(org.apache.james.smtpserver.protocol.SMTPSession, org.apache.james.api.protocol.Request)
- */
- public Response onCommand(SMTPSession session, Request request) {
- Response response = super.onCommand(session, request);
- // Check if the response was not ok
- if (((RetCodeResponse)response).getRetCode().equals(SMTPRetCode.MAIL_OK) == false) {
- // cleanup the session
- session.getState().remove(SMTPSession.SENDER);
- }
-
- return response;
- }
+ *
+ * @see
+ * org.apache.james.smtpserver.protocol.core.AbstractHookableCmdHandler#
+ * onCommand(org.apache.james.smtpserver.protocol.SMTPSession,
+ * org.apache.james.api.protocol.Request)
+ */
+ public Response onCommand(SMTPSession session, Request request) {
+ Response response = super.onCommand(session, request);
+ // Check if the response was not ok
+ if (((RetCodeResponse) response).getRetCode().equals(SMTPRetCode.MAIL_OK) == false) {
+ // cleanup the session
+ session.getState().remove(SMTPSession.SENDER);
+ }
+
+ return response;
+ }
/**
* Handler method called upon receipt of a MAIL command. Sets up handler to
Modified: james/protocols/trunk/smtp/src/main/java/org/apache/james/protocols/smtp/core/UnknownCmdHandler.java
URL: http://svn.apache.org/viewvc/james/protocols/trunk/smtp/src/main/java/org/apache/james/protocols/smtp/core/UnknownCmdHandler.java?rev=1044470&r1=1044469&r2=1044470&view=diff
==============================================================================
--- james/protocols/trunk/smtp/src/main/java/org/apache/james/protocols/smtp/core/UnknownCmdHandler.java (original)
+++ james/protocols/trunk/smtp/src/main/java/org/apache/james/protocols/smtp/core/UnknownCmdHandler.java Fri Dec 10 18:29:35 2010
@@ -47,36 +47,30 @@ public class UnknownCmdHandler extends A
public Collection<String> getImplCommands() {
Collection<String> implCommands = new ArrayList<String>();
implCommands.add(UNKNOWN_COMMAND);
-
+
return implCommands;
}
- @Override
- protected SMTPResponse doCoreCmd(SMTPSession session, String command,
- String parameters) {
- StringBuilder result = new StringBuilder();
- result.append(DSNStatus.getStatus(DSNStatus.PERMANENT, DSNStatus.DELIVERY_INVALID_CMD))
- .append(" Command ")
- .append(command)
- .append(" unrecognized.");
- return new SMTPResponse(SMTPRetCode.SYNTAX_ERROR_COMMAND_UNRECOGNIZED, result);
- }
+ @Override
+ protected SMTPResponse doCoreCmd(SMTPSession session, String command, String parameters) {
+ StringBuilder result = new StringBuilder();
+ result.append(DSNStatus.getStatus(DSNStatus.PERMANENT, DSNStatus.DELIVERY_INVALID_CMD)).append(" Command ").append(command).append(" unrecognized.");
+ return new SMTPResponse(SMTPRetCode.SYNTAX_ERROR_COMMAND_UNRECOGNIZED, result);
+ }
- @Override
- protected SMTPResponse doFilterChecks(SMTPSession session, String command,
- String parameters) {
- session.getState().put("CURR_COMMAND", command);
- return null;
- }
+ @Override
+ protected SMTPResponse doFilterChecks(SMTPSession session, String command, String parameters) {
+ session.getState().put("CURR_COMMAND", command);
+ return null;
+ }
- @Override
- protected HookResult callHook(UnknownHook rawHook, SMTPSession session,
- String parameters) {
- return rawHook.doUnkown(session, (String)session.getState().get("CURR_COMMAND"));
- }
+ @Override
+ protected HookResult callHook(UnknownHook rawHook, SMTPSession session, String parameters) {
+ return rawHook.doUnkown(session, (String) session.getState().get("CURR_COMMAND"));
+ }
- @Override
- protected Class<UnknownHook> getHookInterface() {
- return UnknownHook.class;
- }
+ @Override
+ protected Class<UnknownHook> getHookInterface() {
+ return UnknownHook.class;
+ }
}
---------------------------------------------------------------------
To unsubscribe, e-mail: server-dev-unsubscribe@james.apache.org
For additional commands, e-mail: server-dev-help@james.apache.org