Author: rwinston Date: Mon Mar 8 10:17:43 2010 New Revision: 920258 URL: http://svn.apache.org/viewvc?rev=920258&view=rev Log: Fix and test case for NET-290
Modified: commons/proper/net/branches/NET_2_0/src/main/java/org/apache/commons/net/io/DotTerminatedMessageReader.java Modified: commons/proper/net/branches/NET_2_0/src/main/java/org/apache/commons/net/io/DotTerminatedMessageReader.java URL: http://svn.apache.org/viewvc/commons/proper/net/branches/NET_2_0/src/main/java/org/apache/commons/net/io/DotTerminatedMessageReader.java?rev=920258&r1=920257&r2=920258&view=diff ============================================================================== --- commons/proper/net/branches/NET_2_0/src/main/java/org/apache/commons/net/io/DotTerminatedMessageReader.java (original) +++ commons/proper/net/branches/NET_2_0/src/main/java/org/apache/commons/net/io/DotTerminatedMessageReader.java Mon Mar 8 10:17:43 2010 @@ -158,6 +158,9 @@ LS_CHARS.length); ch = internalBuffer[pos++]; } + else if (ch == '\r') { + internalReader.unread(ch); + } else { internalBuffer[--pos] = (char) ch;