Author: rwinston Date: Fri Mar 12 13:37:31 2010 New Revision: 922250 URL: http://svn.apache.org/viewvc?rev=922250&view=rev Log: Clean up
Modified: commons/proper/net/branches/NET_2_0/src/main/java/org/apache/commons/net/ftp/FTPClient.java Modified: commons/proper/net/branches/NET_2_0/src/main/java/org/apache/commons/net/ftp/FTPClient.java URL: http://svn.apache.org/viewvc/commons/proper/net/branches/NET_2_0/src/main/java/org/apache/commons/net/ftp/FTPClient.java?rev=922250&r1=922249&r2=922250&view=diff ============================================================================== --- commons/proper/net/branches/NET_2_0/src/main/java/org/apache/commons/net/ftp/FTPClient.java (original) +++ commons/proper/net/branches/NET_2_0/src/main/java/org/apache/commons/net/ftp/FTPClient.java Fri Mar 12 13:37:31 2010 @@ -14,7 +14,6 @@ * See the License for the specific language governing permissions and * limitations under the License. */ - package org.apache.commons.net.ftp; import java.io.BufferedInputStream; import java.io.BufferedOutputStream; @@ -501,14 +500,10 @@ implements Configurable if (__dataConnectionMode == ACTIVE_LOCAL_DATA_CONNECTION_MODE) { - ServerSocket server; - server = _serverSocketFactory_.createServerSocket(0, 1, getLocalAddress()); - - server = _serverSocketFactory_.createServerSocket(getActivePort(), 1, getHostAddress()); + ServerSocket server = _serverSocketFactory_.createServerSocket(getActivePort(), 1, getHostAddress()); // try EPRT first. If that fails, and the connection is over IPv4 // fallback to PORT - if (!FTPReply.isPositiveCompletion(eprt(getHostAddress(), getActivePort()))) {