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 2012/01/01 16:38:44 UTC

svn commit: r1226259 - in /james/protocols/trunk/pop3/src/main/java/org/apache/james/protocols/pop3: POP3ProtocolHandlerChain.java core/PassCmdHandler.java

Author: norman
Date: Sun Jan  1 15:38:43 2012
New Revision: 1226259

URL: http://svn.apache.org/viewvc?rev=1226259&view=rev
Log:
Use constructor argument to give MailboxFactory to PassCmdHandler

Modified:
    james/protocols/trunk/pop3/src/main/java/org/apache/james/protocols/pop3/POP3ProtocolHandlerChain.java
    james/protocols/trunk/pop3/src/main/java/org/apache/james/protocols/pop3/core/PassCmdHandler.java

Modified: james/protocols/trunk/pop3/src/main/java/org/apache/james/protocols/pop3/POP3ProtocolHandlerChain.java
URL: http://svn.apache.org/viewvc/james/protocols/trunk/pop3/src/main/java/org/apache/james/protocols/pop3/POP3ProtocolHandlerChain.java?rev=1226259&r1=1226258&r2=1226259&view=diff
==============================================================================
--- james/protocols/trunk/pop3/src/main/java/org/apache/james/protocols/pop3/POP3ProtocolHandlerChain.java (original)
+++ james/protocols/trunk/pop3/src/main/java/org/apache/james/protocols/pop3/POP3ProtocolHandlerChain.java Sun Jan  1 15:38:43 2012
@@ -65,9 +65,7 @@ public class POP3ProtocolHandlerChain ex
         List<ProtocolHandler> handlers = new ArrayList<ProtocolHandler>();
         handlers.add(new CapaCmdHandler());
         handlers.add(new UserCmdHandler());
-        PassCmdHandler handler = new PassCmdHandler();
-        handler.setMailboxFactory(mailboxFactory);
-        handlers.add(handler);
+        handlers.add(new PassCmdHandler(mailboxFactory));
         handlers.add(new ListCmdHandler());
         handlers.add(new UidlCmdHandler());
         handlers.add(new RsetCmdHandler());

Modified: james/protocols/trunk/pop3/src/main/java/org/apache/james/protocols/pop3/core/PassCmdHandler.java
URL: http://svn.apache.org/viewvc/james/protocols/trunk/pop3/src/main/java/org/apache/james/protocols/pop3/core/PassCmdHandler.java?rev=1226259&r1=1226258&r2=1226259&view=diff
==============================================================================
--- james/protocols/trunk/pop3/src/main/java/org/apache/james/protocols/pop3/core/PassCmdHandler.java (original)
+++ james/protocols/trunk/pop3/src/main/java/org/apache/james/protocols/pop3/core/PassCmdHandler.java Sun Jan  1 15:38:43 2012
@@ -40,12 +40,11 @@ public class PassCmdHandler extends Rset
     private static final Response UNEXPECTED_ERROR = new POP3Response(POP3Response.ERR_RESPONSE, "Unexpected error accessing mailbox").immutable();
     private static final Response AUTH_FAILED = new POP3Response(POP3Response.ERR_RESPONSE, "Authentication failed.").immutable();
 
-    private MailboxFactory mailboxManager;
+    private final MailboxFactory factory;
 
-    public void setMailboxFactory(MailboxFactory manager) {
-        this.mailboxManager = manager;
+    public PassCmdHandler(MailboxFactory factory) {
+        this.factory = factory;
     }
-
     /**
      * Handler method called upon receipt of a PASS command. Reads in and
      * validates the password.
@@ -56,7 +55,7 @@ public class PassCmdHandler extends Rset
         if (session.getHandlerState() == POP3Session.AUTHENTICATION_USERSET && parameters != null) {
             String passArg = parameters;
             try {
-                Mailbox mailbox = mailboxManager.getMailbox(session, passArg);
+                Mailbox mailbox = factory.getMailbox(session, passArg);
                 if (mailbox != null) {
                     session.setUserMailbox(mailbox);
                     stat(session);



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