Author: norman
Date: Sat Sep 24 12:03:52 2011
New Revision: 1175163

URL: http://svn.apache.org/viewvc?rev=1175163&view=rev
Log:
LineHandler and ConnectHandler now return Response. See PROTOCOLS-34

Modified:
    
james/server/trunk/pop3server/src/main/java/org/apache/james/pop3server/core/POP3CommandDispatcherLineHandler.java
    
james/server/trunk/pop3server/src/main/java/org/apache/james/pop3server/core/WelcomeMessageHandler.java

Modified: 
james/server/trunk/pop3server/src/main/java/org/apache/james/pop3server/core/POP3CommandDispatcherLineHandler.java
URL: 
http://svn.apache.org/viewvc/james/server/trunk/pop3server/src/main/java/org/apache/james/pop3server/core/POP3CommandDispatcherLineHandler.java?rev=1175163&r1=1175162&r2=1175163&view=diff
==============================================================================
--- 
james/server/trunk/pop3server/src/main/java/org/apache/james/pop3server/core/POP3CommandDispatcherLineHandler.java
 (original)
+++ 
james/server/trunk/pop3server/src/main/java/org/apache/james/pop3server/core/POP3CommandDispatcherLineHandler.java
 Sat Sep 24 12:03:52 2011
@@ -27,6 +27,7 @@ import javax.annotation.Resource;
 import org.apache.james.mailbox.MailboxManager;
 import org.apache.james.mailbox.MailboxSession;
 import org.apache.james.pop3server.POP3Session;
+import org.apache.james.protocols.api.Response;
 import org.apache.james.protocols.api.handler.AbstractCommandDispatcher;
 import org.apache.james.protocols.api.handler.CommandHandler;
 
@@ -66,18 +67,19 @@ public class POP3CommandDispatcherLineHa
 
     
     @Override
-    public void onLine(POP3Session session, byte[] line) {
+    public Response onLine(POP3Session session, byte[] line) {
         MailboxSession mSession = (MailboxSession) 
session.getState().get(POP3Session.MAILBOX_SESSION);
 
         // notify the mailboxmanager about the start of the processing
         manager.startProcessingRequest(mSession);
 
         // do the processing
-        super.onLine(session, line);
+        Response response = super.onLine(session, line);
 
         // notify the mailboxmanager about the end of the processing
         manager.endProcessingRequest(mSession);
 
+        return response;
     }
 
 }

Modified: 
james/server/trunk/pop3server/src/main/java/org/apache/james/pop3server/core/WelcomeMessageHandler.java
URL: 
http://svn.apache.org/viewvc/james/server/trunk/pop3server/src/main/java/org/apache/james/pop3server/core/WelcomeMessageHandler.java?rev=1175163&r1=1175162&r2=1175163&view=diff
==============================================================================
--- 
james/server/trunk/pop3server/src/main/java/org/apache/james/pop3server/core/WelcomeMessageHandler.java
 (original)
+++ 
james/server/trunk/pop3server/src/main/java/org/apache/james/pop3server/core/WelcomeMessageHandler.java
 Sat Sep 24 12:03:52 2011
@@ -21,6 +21,7 @@ package org.apache.james.pop3server.core
 
 import org.apache.james.pop3server.POP3Response;
 import org.apache.james.pop3server.POP3Session;
+import org.apache.james.protocols.api.Response;
 import org.apache.james.protocols.api.handler.ConnectHandler;
 
 public class WelcomeMessageHandler implements ConnectHandler<POP3Session> {
@@ -31,13 +32,13 @@ public class WelcomeMessageHandler imple
     /**
      * @see 
org.apache.james.pop3server.ConnectHandler#onConnect(org.apache.james.pop3server.POP3Session)
      */
-    public void onConnect(POP3Session session) {
+    public Response onConnect(POP3Session session) {
         StringBuilder responseBuffer = new StringBuilder();
         // Initially greet the connector
         // Format is: Sat, 24 Jan 1998 13:16:09 -0500
         
responseBuffer.append(session.getConfigurationData().getHelloName()).append(" 
POP3 server (").append(softwaretype).append(") ready ");
         POP3Response response = new POP3Response(POP3Response.OK_RESPONSE, 
responseBuffer.toString());
-        session.writeResponse(response);
+        return response;
     }
 
 }



---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]

Reply via email to