Author: rwinston
Date: Wed Jun 6 16:50:21 2007
New Revision: 544994
URL: http://svn.apache.org/viewvc?view=rev&rev=544994
Log:
Rollback
Modified:
jakarta/commons/proper/net/branches/JDK_1_5_BRANCH/src/main/java/org/apache/commons/net/ftp/FTP.java
Modified:
jakarta/commons/proper/net/branches/JDK_1_5_BRANCH/src/main/java/org/apache/commons/net/ftp/FTP.java
URL:
http://svn.apache.org/viewvc/jakarta/commons/proper/net/branches/JDK_1_5_BRANCH/src/main/java/org/apache/commons/net/ftp/FTP.java?view=diff&rev=544994&r1=544993&r2=544994
==============================================================================
---
jakarta/commons/proper/net/branches/JDK_1_5_BRANCH/src/main/java/org/apache/commons/net/ftp/FTP.java
(original)
+++
jakarta/commons/proper/net/branches/JDK_1_5_BRANCH/src/main/java/org/apache/commons/net/ftp/FTP.java
Wed Jun 6 16:50:21 2007
@@ -33,7 +33,7 @@
import org.apache.commons.net.SocketClient;
/***
- * FTP provides basic functionality necessary to implement your
+ * FTP provides the basic the functionality necessary to implement your
* own FTP client. It extends org.apache.commons.net.SocketClient since
* extending TelnetClient was causing unwanted behavior (like connections
* that did not time out properly).
@@ -311,7 +311,8 @@
// returning too soon after encountering a naked CR or some
other
// anomaly.
}
- while ((line.length() >= 4 || line.charAt(3) == '-' ||
!(line.substring(0,3).matches("\\d{3}"))));
+ while (!(line.length() >= 4 && line.charAt(3) != '-' &&
+ Character.isDigit(line.charAt(0))));
// This is too strong a condition because of non-conforming ftp
// servers like ftp.funet.fi which sent 226 as the last line of a
// 426 multi-line reply in response to ls /. We relax the
condition to
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
