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 2006/12/27 16:34:25 UTC

svn commit: r490517 - /james/server/sandbox/handlerapi-experiment/src/java/org/apache/james/smtpserver/core/RcptCmdHandler.java

Author: norman
Date: Wed Dec 27 07:34:24 2006
New Revision: 490517

URL: http://svn.apache.org/viewvc?view=rev&rev=490517
Log:
Fix formating

Modified:
    james/server/sandbox/handlerapi-experiment/src/java/org/apache/james/smtpserver/core/RcptCmdHandler.java

Modified: james/server/sandbox/handlerapi-experiment/src/java/org/apache/james/smtpserver/core/RcptCmdHandler.java
URL: http://svn.apache.org/viewvc/james/server/sandbox/handlerapi-experiment/src/java/org/apache/james/smtpserver/core/RcptCmdHandler.java?view=diff&rev=490517&r1=490516&r2=490517
==============================================================================
--- james/server/sandbox/handlerapi-experiment/src/java/org/apache/james/smtpserver/core/RcptCmdHandler.java (original)
+++ james/server/sandbox/handlerapi-experiment/src/java/org/apache/james/smtpserver/core/RcptCmdHandler.java Wed Dec 27 07:34:24 2006
@@ -55,15 +55,15 @@
         SMTPResponse response = doRCPTFilter(session,parameters);
     
         if (response == null) {
-        response = processExtensions(session);
-        if (response == null) {
-            return doRCPT(session, parameters);
+            response = processExtensions(session);
+            if (response == null) {
+                return doRCPT(session, parameters);
+            } else {
+                return response;
+            }
         } else {
-        return response;
+            return response;
         }
-    } else {
-        return response;
-    }
 
     }
 
@@ -76,7 +76,7 @@
             int count = rcptHooks.size();
             for(int i =0; i < count; i++) {
                     
-                int rCode = ((RcptHook) rcptHooks.get(i)).doRcpt(session, (MailAddress) session.getState().get(SMTPSession.CURRENT_RECIPIENT), (MailAddress) session.getState().get(SMTPSession.SENDER));
+                int rCode = ((RcptHook) rcptHooks.get(i)).doRcpt(session, (MailAddress) session.getState().get(SMTPSession.SENDER), (MailAddress) session.getState().get(SMTPSession.CURRENT_RECIPIENT));
                     
                 if (rCode == RcptHook.DENY) {
                     return new SMTPResponse(SMTPRetCode.TRANSACTION_FAILED,"Email rejected");



---------------------------------------------------------------------
To unsubscribe, e-mail: server-dev-unsubscribe@james.apache.org
For additional commands, e-mail: server-dev-help@james.apache.org