Author: rwinston
Date: Sun Nov 12 16:06:51 2006
New Revision: 474103
URL: http://svn.apache.org/viewvc?view=rev&rev=474103
Log:
Remove redundant comment and work around the issue where _replyLines_.get(0)
was returning the incorrect reply line : change this to _replyLines_.get(
_replyLines_.size() -1 ). This issue may need to be looked at again.
Modified:
jakarta/commons/proper/net/branches/JDK_1_5_BRANCH/src/main/java/org/apache/commons/net/ftp/FTPClient.java
Modified:
jakarta/commons/proper/net/branches/JDK_1_5_BRANCH/src/main/java/org/apache/commons/net/ftp/FTPClient.java
URL:
http://svn.apache.org/viewvc/jakarta/commons/proper/net/branches/JDK_1_5_BRANCH/src/main/java/org/apache/commons/net/ftp/FTPClient.java?view=diff&rev=474103&r1=474102&r2=474103
==============================================================================
---
jakarta/commons/proper/net/branches/JDK_1_5_BRANCH/src/main/java/org/apache/commons/net/ftp/FTPClient.java
(original)
+++
jakarta/commons/proper/net/branches/JDK_1_5_BRANCH/src/main/java/org/apache/commons/net/ftp/FTPClient.java
Sun Nov 12 16:06:51 2006
@@ -219,11 +219,6 @@
* <li>are in different timezones and you need accurate timestamps for
dependency checking
* as in Ant</li>
* </ul>see [EMAIL PROTECTED] FTPClientConfig FTPClientConfig}.
- * <p>
- * NOTE: If you experience problems with unwanted firing of
<pre>setSoTimeout()</pre>
- * during periods of client inactivity, this can be alleviated by calling
<pre>setReaderThread(false)</pre>.
- * For more details, see <a
href="http://issues.apache.org/bugzilla/show_bug.cgi?id=31122";>this thread</a>.
- * </p>
* <p>
* @author Daniel F. Savarese
* @see FTP
@@ -515,7 +510,7 @@
if (pasv() != FTPReply.ENTERING_PASSIVE_MODE)
return null;
- __parsePassiveModeReply((String)_replyLines.get(0));
+ __parsePassiveModeReply((String)_replyLines.get(_replyLines.size()
- 1));
socket = _socketFactory_.createSocket(__passiveHost,
__passivePort);
if ((__restartOffset > 0) && !restart(__restartOffset))
@@ -1863,7 +1858,7 @@
// in practice FTP servers deviate, so we soften the condition to
// a positive completion.
if (__systemName == null && FTPReply.isPositiveCompletion(syst()))
- __systemName = ((String)_replyLines.get(0)).substring(4);
+ __systemName = ((String)_replyLines.get(_replyLines.size() -
1)).substring(4);
return __systemName;
}
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
