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

[sebb]

Author: sebb
Date: Wed Mar 23 16:10:51 2011
New Revision: 1084622

URL: http://svn.apache.org/viewvc?rev=1084622&view=rev
Log:
Fix bug introduced in r1083955 to fix NET-385 - don't skip initial reply if not 
applying timeout (oops)

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

Modified: 
commons/proper/net/trunk/src/main/java/org/apache/commons/net/ftp/FTP.java
URL: 
http://svn.apache.org/viewvc/commons/proper/net/trunk/src/main/java/org/apache/commons/net/ftp/FTP.java?rev=1084622&r1=1084621&r2=1084622&view=diff
==============================================================================
--- commons/proper/net/trunk/src/main/java/org/apache/commons/net/ftp/FTP.java 
(original)
+++ commons/proper/net/trunk/src/main/java/org/apache/commons/net/ftp/FTP.java 
Wed Mar 23 16:10:51 2011
@@ -378,7 +378,7 @@ public class FTP extends SocketClient
             new BufferedWriter(new OutputStreamWriter(_output_, 
getControlEncoding()));
         if (connectTimeout > 0) { // NET-385
             int original = _socket_.getSoTimeout();
-            _socket_.setSoTimeout(connectTimeout); 
+            _socket_.setSoTimeout(connectTimeout);
             try {
                 __getReply();
                 // If we received code 120, we have to fetch completion reply.
@@ -391,6 +391,11 @@ public class FTP extends SocketClient
             } finally {
                 _socket_.setSoTimeout(original);
             }
+        } else {
+            __getReply();
+            // If we received code 120, we have to fetch completion reply.
+            if (FTPReply.isPositivePreliminary(_replyCode))
+                __getReply();            
         }
     }