This code can be incorporated, I believe, by replacing the following line in SMTPHandler.handleConnection():
inReader = new BufferedReader(new InputStreamReader(in, "ASCII"), 512);
with this line:
inReader = new CRLF_TerminatedLineReader(in, "ASCII");I have tested this class with an InputStream which included CR and LF characters in the wrong places (not combined as CRLF at the end of line). It seems to behave as described in its Javadoc.
Rich Hammer
//package ?
import java.io.*;
/**
* A Reader for use with SMTP or other protocols in which lines
* must end with CRLF. Extends BufferedReader and overrides its
* readLine() method. The BufferedReader readLine() method cannot
* serve for SMTP because it ends lines with either CR or LF alone.
*/
public class CRLF_TerminatedLineReader extends BufferedReader{
/**
* Constructs this CRLF_TerminatedLineReader.
* @param in an InputStream
* @param charsetName the String name of a supported charset.
* "ASCII" is common here.
* @throws UnsupportedEncodingException if the named charset
* is not supported
*/
public CRLF_TerminatedLineReader(InputStream in, String charsetName)
throws UnsupportedEncodingException {
super(new InputStreamReader(in, charsetName));
}
private StringBuffer lineBuffer = new StringBuffer();
private final int
EOF = -1,
CR = 13,
LF = 10;
/**
* Read a line of text which is terminated by CRLF. The concluding
* CRLF characters are not returned with the String, but if either CR
* or LF appears in the text in any other sequence it is returned
* in the String like any other character. Some characters at the
* end of the stream may be lost if they are in a "line" not
* terminated by CRLF.
*
* @return either a String containing the contents of a
* line which must end with CRLF, or null if the end of the
* stream has been reached, possibly discarding some characters
* in a line not terminated with CRLF.
* @throws IOException if an I/O error occurs.
*/
public String readLine() throws IOException{
//start with the StringBuffer empty
lineBuffer.delete(0, lineBuffer.length());
/* This boolean tells which state we are in,
* depending upon whether or not we got a CR
* in the preceding read().
*/
boolean cr_just_received = false;
while (true){
int inChar = read();
if (!cr_just_received){
//the most common case, somewhere before the end of a line
switch (inChar){
case CR : cr_just_received = true;
break;
case EOF : return null;
default : lineBuffer.append((char)inChar);
}
}else{
// CR has been received, we may be at end of line
switch (inChar){
case LF : //the normal ending of a line
return lineBuffer.toString();
case EOF : return null;
case CR : //we got two (or more) CRs in a row
lineBuffer.append((char)CR);
break;
default : //we got some other character following a CR
lineBuffer.append((char)CR);
lineBuffer.append((char)inChar);
cr_just_received = false;
}
}
}//while
}//method readLine()
}
--------------------------------------------------------------------- To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
