svn commit: r1787849 - in /commons/proper/net/trunk/src: changes/changes.xml main/java/org/apache/commons/net/ftp/FTPClient.java

[sebb]

Author: sebb
Date: Mon Mar 20 21:19:54 2017
New Revision: 1787849

URL: http://svn.apache.org/viewvc?rev=1787849&view=rev
Log:
NET-584 Error when using org.apache.commons.net.ftp.FTPClient 
setControlKeepAliveTimeout

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

Modified: commons/proper/net/trunk/src/changes/changes.xml
URL: 
http://svn.apache.org/viewvc/commons/proper/net/trunk/src/changes/changes.xml?rev=1787849&r1=1787848&r2=1787849&view=diff
==============================================================================
--- commons/proper/net/trunk/src/changes/changes.xml [utf-8] (original)
+++ commons/proper/net/trunk/src/changes/changes.xml [utf-8] Mon Mar 20 
21:19:54 2017
@@ -71,6 +71,9 @@ This is mainly a bug-fix release. See fu
  However it is not source compatible with releases before 3.4, as some methods 
were added to the interface NtpV3Packet in 3.4
         
 ">
+            <action issue="NET-584" type="fix" dev="sebb" due-to="Kazantsev 
Andrey Sergeevich/Nick Manley">
+            Error when using org.apache.commons.net.ftp.FTPClient 
setControlKeepAliveTimeout
+            </action>
             <action issue="NET-626" type="update" dev="sebb" due-to="Makoto 
Sakaguchi">
             SubnetUtils#SubnetUtils - improved comment
             </action>

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=1787849&r1=1787848&r2=1787849&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
 Mon Mar 20 21:19:54 2017
@@ -3928,16 +3928,12 @@ implements Configurable
 
         int[] cleanUp() throws IOException {
             int remain = notAcked;
-            if (notAcked > 0) { // TODO remove this before next release!
-                System.err.println("NET-584: notAcked=" + notAcked);
-            }
             try {
                 while(notAcked > 0) {
                     parent.getReply(); // we do want to see these
                     notAcked--; // only decrement if actually received
                 }
             } catch (SocketTimeoutException e) { // NET-584
-                System.err.println("NET-584: ignoring " + e.getMessage()); // 
TODO remove print before release!
                 // ignored
             } finally {
                 parent.setSoTimeout(currentSoTimeout);