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

[se...@apache.org]

Author: sebb
Date: Wed Apr  2 22:12:58 2014
New Revision: 1584204

URL: http://svn.apache.org/r1584204
Log:
NET-530 input parameter of org.apache.commons.net.ftp.FTP.__getReply(boolean) is not used

Modified:
    commons/proper/net/trunk/src/changes/changes.xml
    commons/proper/net/trunk/src/main/java/org/apache/commons/net/ftp/FTP.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=1584204&r1=1584203&r2=1584204&view=diff
==============================================================================
--- commons/proper/net/trunk/src/changes/changes.xml [utf-8] (original)
+++ commons/proper/net/trunk/src/changes/changes.xml [utf-8] Wed Apr  2 22:12:58 2014
@@ -65,6 +65,9 @@ The <action> type attribute can be add,u
         <release version="3.4" date="2014-01-??" description="
 This is mainly a bug-fix release. See further details below.
         ">
+            <action issue="NET-530" type="fix" dev="sebb" due-to="fish ship">
+            input parameter of org.apache.commons.net.ftp.FTP.__getReply(boolean) is not used
+            </action>
             <action issue="NET-529" type="fix" dev="sebb" due-to="Putinas Piliponis">
             SubnetUtils throws exception on valid input
             </action>

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=1584204&r1=1584203&r2=1584204&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 Apr  2 22:12:58 2014
@@ -361,7 +361,9 @@ public class FTP extends SocketClient
             while ( isStrictMultilineParsing() ? __strictCheck(line, code) : __lenientCheck(line));
         }
 
-        fireReplyReceived(_replyCode, getReplyString());
+        if (reportReply) {
+            fireReplyReceived(_replyCode, getReplyString());
+        }
 
         if (_replyCode == FTPReply.SERVICE_NOT_AVAILABLE) {
             throw new FTPConnectionClosedException("FTP response 421 received.  Server closed connection.");