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 ba...@apache.org on 2006/12/27 01:16:54 UTC
svn commit: r490412 - in
/james/server/sandbox/handlerapi-experiment/src/java/org/apache/james:
core/AbstractJamesHandler.java util/CRLFDelimitedByteBuffer.java
Author: bago
Date: Tue Dec 26 16:16:53 2006
New Revision: 490412
URL: http://svn.apache.org/viewvc?view=rev&rev=490412
Log:
Bugfixes to pass POP3ServerTest. The non-ascii in password test still fail, but this could be ok. We should check this.
Modified:
james/server/sandbox/handlerapi-experiment/src/java/org/apache/james/core/AbstractJamesHandler.java
james/server/sandbox/handlerapi-experiment/src/java/org/apache/james/util/CRLFDelimitedByteBuffer.java
Modified: james/server/sandbox/handlerapi-experiment/src/java/org/apache/james/core/AbstractJamesHandler.java
URL: http://svn.apache.org/viewvc/james/server/sandbox/handlerapi-experiment/src/java/org/apache/james/core/AbstractJamesHandler.java?view=diff&rev=490412&r1=490411&r2=490412
==============================================================================
--- james/server/sandbox/handlerapi-experiment/src/java/org/apache/james/core/AbstractJamesHandler.java (original)
+++ james/server/sandbox/handlerapi-experiment/src/java/org/apache/james/core/AbstractJamesHandler.java Tue Dec 26 16:16:53 2006
@@ -457,7 +457,12 @@
}
public final String readInputLineAsString() throws IOException {
- return bytebufferHandler.readString();
+ String line = bytebufferHandler.readString();
+ if (line != null && line.length() >= 2) {
+ return line.substring(0,line.length()-2);
+ } else {
+ return line;
+ }
}
}
Modified: james/server/sandbox/handlerapi-experiment/src/java/org/apache/james/util/CRLFDelimitedByteBuffer.java
URL: http://svn.apache.org/viewvc/james/server/sandbox/handlerapi-experiment/src/java/org/apache/james/util/CRLFDelimitedByteBuffer.java?view=diff&rev=490412&r1=490411&r2=490412
==============================================================================
--- james/server/sandbox/handlerapi-experiment/src/java/org/apache/james/util/CRLFDelimitedByteBuffer.java (original)
+++ james/server/sandbox/handlerapi-experiment/src/java/org/apache/james/util/CRLFDelimitedByteBuffer.java Tue Dec 26 16:16:53 2006
@@ -111,8 +111,8 @@
synchronized public String readString() throws IOException, LineLengthExceededException, TerminationException {
byte[] buffer = new byte[1000];
- while (isEmpty()) {
- int length = input.read(buffer);
+ int length;
+ while (lines.isEmpty() && isEmpty() && (length = input.read(buffer))!=-1) {
write(buffer, length);
}
if (lines.isEmpty()) return null;
---------------------------------------------------------------------
To unsubscribe, e-mail: server-dev-unsubscribe@james.apache.org
For additional commands, e-mail: server-dev-help@james.apache.org