svn commit: r1089262 - /commons/proper/net/trunk/src/main/java/org/apache/commons/net/ftp/FTPClient.java

[sebb]

Author: sebb
Date: Tue Apr  5 22:02:21 2011
New Revision: 1089262

URL: http://svn.apache.org/viewvc?rev=1089262&view=rev
Log:
NET-401 FTP class uses BufferedReader for control channel, which does not 
follow the standard.
Changed reader to CRLFLineReader.

Modified:
    
commons/proper/net/trunk/src/main/java/org/apache/commons/net/ftp/FTPClient.java

Modified: 
commons/proper/net/trunk/src/main/java/org/apache/commons/net/ftp/FTPClient.java
URL: 
http://svn.apache.org/viewvc/commons/proper/net/trunk/src/main/java/org/apache/commons/net/ftp/FTPClient.java?rev=1089262&r1=1089261&r2=1089262&view=diff
==============================================================================
--- 
commons/proper/net/trunk/src/main/java/org/apache/commons/net/ftp/FTPClient.java
 (original)
+++ 
commons/proper/net/trunk/src/main/java/org/apache/commons/net/ftp/FTPClient.java
 Tue Apr  5 22:02:21 2011
@@ -44,6 +44,7 @@ import org.apache.commons.net.ftp.parser
 import org.apache.commons.net.ftp.parser.FTPFileEntryParserFactory;
 import org.apache.commons.net.ftp.parser.MLSxEntryParser;
 import org.apache.commons.net.ftp.parser.ParserInitializationException;
+import org.apache.commons.net.io.CRLFLineReader;
 import org.apache.commons.net.io.CopyStreamAdapter;
 import org.apache.commons.net.io.CopyStreamEvent;
 import org.apache.commons.net.io.CopyStreamException;
@@ -753,7 +754,7 @@ implements Configurable
             {
                  setControlEncoding("UTF-8");
                  _controlInput_ =
-                     new BufferedReader(new InputStreamReader(_input_, 
getControlEncoding()));
+                     new CRLFLineReader(new InputStreamReader(_input_, 
getControlEncoding()));
                  _controlOutput_ =
                     new BufferedWriter(new OutputStreamWriter(_output_, 
getControlEncoding()));
             }