Mailing-List: contact commits-help@commons.apache.org; run by ezmlm
Precedence: bulk
Reply-To: dev@commons.apache.org
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: 7bit
Subject: svn commit: r1239952 -
 /commons/proper/net/trunk/src/main/java/org/apache/commons/net/ftp/FTPHTTPClient.java
Date: Fri, 03 Feb 2012 00:25:20 -0000
To: commits@commons.apache.org
From: sebb@apache.org
Message-Id: <20120203002520.9FFB123889BB@eris.apache.org>

Author: sebb
Date: Fri Feb  3 00:25:20 2012
New Revision: 1239952

URL: http://svn.apache.org/viewvc?rev=1239952&view=rev
Log:
NET-291 enterLocalPassiveMode is set back to Active on connect
Correctly override super-class

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

Modified: commons/proper/net/trunk/src/main/java/org/apache/commons/net/ftp/FTPHTTPClient.java
URL: http://svn.apache.org/viewvc/commons/proper/net/trunk/src/main/java/org/apache/commons/net/ftp/FTPHTTPClient.java?rev=1239952&r1=1239951&r2=1239952&view=diff
==============================================================================
--- commons/proper/net/trunk/src/main/java/org/apache/commons/net/ftp/FTPHTTPClient.java (original)
+++ commons/proper/net/trunk/src/main/java/org/apache/commons/net/ftp/FTPHTTPClient.java Fri Feb  3 00:25:20 2012
@@ -62,9 +62,22 @@ public class FTPHTTPClient extends FTPCl
      *
      * @throws IllegalStateException if connection mode is not passive
      */
+    // Kept to maintain binary compatibility
+    // Not strictly necessary, but Clirr complains even though there is a super-impl
     @Override
     protected Socket _openDataConnection_(int command, String arg) 
     throws IOException {
+        return super._openDataConnection_(command, arg);
+    }
+
+    /**
+     * {@inheritDoc}
+     *
+     * @throws IllegalStateException if connection mode is not passive
+     */
+    @Override
+    protected Socket _openDataConnection_(String command, String arg) 
+    throws IOException {
         //Force local passive mode, active mode not supported by through proxy
         if (getDataConnectionMode() != PASSIVE_LOCAL_DATA_CONNECTION_MODE) {
             throw new IllegalStateException("Only passive connection mode supported");