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 rd...@apache.org on 2009/09/16 14:36:30 UTC
svn commit: r815738 - in /james/server/trunk:
pop3server-function/src/main/java/org/apache/james/pop3server/POP3Handler.java
smtpserver-function/src/main/java/org/apache/james/smtpserver/SMTPHandler.java
Author: rdonkin
Date: Wed Sep 16 12:36:30 2009
New Revision: 815738
URL: http://svn.apache.org/viewvc?rev=815738&view=rev
Log:
JAMES-920 Switch from helper set by setter to context set on handle https://issues.apache.org/jira/browse/JAMES-920
Modified:
james/server/trunk/pop3server-function/src/main/java/org/apache/james/pop3server/POP3Handler.java
james/server/trunk/smtpserver-function/src/main/java/org/apache/james/smtpserver/SMTPHandler.java
Modified: james/server/trunk/pop3server-function/src/main/java/org/apache/james/pop3server/POP3Handler.java
URL: http://svn.apache.org/viewvc/james/server/trunk/pop3server-function/src/main/java/org/apache/james/pop3server/POP3Handler.java?rev=815738&r1=815737&r2=815738&view=diff
==============================================================================
--- james/server/trunk/pop3server-function/src/main/java/org/apache/james/pop3server/POP3Handler.java (original)
+++ james/server/trunk/pop3server-function/src/main/java/org/apache/james/pop3server/POP3Handler.java Wed Sep 16 12:36:30 2009
@@ -45,7 +45,7 @@
*/
public class POP3Handler implements POP3Session, ProtocolHandler {
- private ProtocolContext helper;
+ private ProtocolContext context;
private final static byte COMMAND_MODE = 1;
private final static byte RESPONSE_MODE = 2;
@@ -164,6 +164,7 @@
* @see org.apache.james.socket.AbstractJamesHandler#handleProtocol(ProtocolContext)
*/
public void handleProtocol(ProtocolContext context) throws IOException {
+ this.context = context;
handlerState = AUTHENTICATION_READY;
authenticatedUser = "unknown";
@@ -303,13 +304,13 @@
*/
public final String readCommandLine() throws IOException {
for (;;) try {
- String commandLine = helper.getInputReader().readLine();
+ String commandLine = context.getInputReader().readLine();
if (commandLine != null) {
commandLine = commandLine.trim();
}
return commandLine;
} catch (CRLFTerminatedReader.TerminationException te) {
- helper.writeLoggedFlushedResponse("-ERR Syntax error at character position " + te.position() + ". CR and LF must be CRLF paired. See RFC 1939 #3.");
+ context.writeLoggedFlushedResponse("-ERR Syntax error at character position " + te.position() + ". CR and LF must be CRLF paired. See RFC 1939 #3.");
}
}
@@ -326,14 +327,14 @@
* @see org.apache.james.pop3server.POP3Session#getRemoteHost()
*/
public String getRemoteHost() {
- return helper.getRemoteHost();
+ return context.getRemoteHost();
}
/**
* @see org.apache.james.pop3server.POP3Session#getRemoteIPAddress()
*/
public String getRemoteIPAddress() {
- return helper.getRemoteIP();
+ return context.getRemoteIP();
}
/**
@@ -391,14 +392,14 @@
* @see org.apache.james.pop3server.POP3Session#getWatchdog()
*/
public Watchdog getWatchdog() {
- return helper.getWatchdog();
+ return context.getWatchdog();
}
/**
* @see org.apache.james.pop3server.POP3Session#writeResponse(java.lang.String)
*/
public void writeResponse(String respString) {
- helper.writeLoggedFlushedResponse(respString);
+ context.writeLoggedFlushedResponse(respString);
//TODO Explain this well
if(mode == COMMAND_MODE) {
mode = RESPONSE_MODE;
@@ -487,14 +488,12 @@
* @see org.apache.james.pop3server.POP3Session#getOutputStream()
*/
public OutputStream getOutputStream() {
- return helper.getOutputStream();
+ return context.getOutputStream();
}
/**
* @see org.apache.james.socket.ProtocolHandler#setProtocolHandlerHelper(org.apache.james.socket.ProtocolContext)
*/
public void setProtocolHandlerHelper(ProtocolContext phh) {
- this.helper = phh;
}
-
}
Modified: james/server/trunk/smtpserver-function/src/main/java/org/apache/james/smtpserver/SMTPHandler.java
URL: http://svn.apache.org/viewvc/james/server/trunk/smtpserver-function/src/main/java/org/apache/james/smtpserver/SMTPHandler.java?rev=815738&r1=815737&r2=815738&view=diff
==============================================================================
--- james/server/trunk/smtpserver-function/src/main/java/org/apache/james/smtpserver/SMTPHandler.java (original)
+++ james/server/trunk/smtpserver-function/src/main/java/org/apache/james/smtpserver/SMTPHandler.java Wed Sep 16 12:36:30 2009
@@ -39,7 +39,7 @@
*/
public class SMTPHandler implements ProtocolHandler, SMTPSession {
- private ProtocolContext helper;
+ private ProtocolContext context;
private boolean sessionEnded = false;
@@ -97,6 +97,7 @@
* @see org.apache.james.socket.ProtocolHandler#handleProtocol(ProtocolContext)
*/
public void handleProtocol(ProtocolContext context) throws IOException {
+ this.context = context;
smtpID = Integer.toString(random.nextInt(1024));
relayingAllowed = theConfigData.isRelayingAllowed(context.getRemoteIP());
authSupported = theConfigData.isAuthRequired(context.getRemoteIP());
@@ -177,7 +178,7 @@
// Write a single-line or multiline response
if (response != null) {
if (response.getRawLine() != null) {
- helper.writeLoggedFlushedResponse(response.getRawLine());
+ context.writeLoggedFlushedResponse(response.getRawLine());
} else {
// Iterator i = esmtpextensions.iterator();
for (int k = 0; k < response.getLines().size(); k++) {
@@ -187,11 +188,11 @@
if (k == response.getLines().size() - 1) {
respBuff.append(" ");
respBuff.append(line);
- helper.writeLoggedFlushedResponse(respBuff.toString());
+ context.writeLoggedFlushedResponse(respBuff.toString());
} else {
respBuff.append("-");
respBuff.append(line);
- helper.writeLoggedResponse(respBuff.toString());
+ context.writeLoggedResponse(respBuff.toString());
}
}
}
@@ -223,14 +224,14 @@
* @see org.apache.james.smtpserver.SMTPSession#getRemoteHost()
*/
public String getRemoteHost() {
- return helper.getRemoteHost();
+ return context.getRemoteHost();
}
/**
* @see org.apache.james.smtpserver.SMTPSession#getRemoteIPAddress()
*/
public String getRemoteIPAddress() {
- return helper.getRemoteIP();
+ return context.getRemoteIP();
}
/**
@@ -374,9 +375,7 @@
public void fatalFailure(RuntimeException e, ProtocolContext context) {
}
- public void setProtocolHandlerHelper(ProtocolContext phh) {
- helper = phh;
- }
+ public void setProtocolHandlerHelper(ProtocolContext phh) {}
public String getHelloName() {
return getConfigurationData().getHelloName();
@@ -399,6 +398,6 @@
}
public Log getLogger() {
- return helper.getLogger();
+ return context.getLogger();
}
}
---------------------------------------------------------------------
To unsubscribe, e-mail: server-dev-unsubscribe@james.apache.org
For additional commands, e-mail: server-dev-help@james.apache.org