From de249300a2a75fe42f344513cea5fb2291795f24 Mon Sep 17 00:00:00 2001
From: "Steven M. Cohen" <scohen@apache.org>
Date: Fri, 13 May 2005 10:34:40 +0000
Subject: [PATCH] improve clarity of what FTPConfigurator is doing.

git-svn-id: https://svn.apache.org/repos/asf/ant/core/trunk@278258 13f79535-47bb-0310-9956-ffa450edef68
---
 .../apache/tools/ant/taskdefs/optional/net/FTP.java    | 10 +++-------
 1 file changed, 3 insertions(+), 7 deletions(-)

diff --git a/src/main/org/apache/tools/ant/taskdefs/optional/net/FTP.java b/src/main/org/apache/tools/ant/taskdefs/optional/net/FTP.java
index a64ac7ce8..353c1dcd7 100644
--- a/src/main/org/apache/tools/ant/taskdefs/optional/net/FTP.java
+++ b/src/main/org/apache/tools/ant/taskdefs/optional/net/FTP.java
@@ -2067,12 +2067,6 @@ public class FTP
         }
     }
 
-    private void configure(FTPClient ftp) {
-        if (this.isConfigurationSet) {
-            FTPConfigurator.configure(ftp, this);
-        }
-    }
-
     /**
      * Runs the task.
      *
@@ -2088,7 +2082,9 @@ public class FTP
             log("Opening FTP connection to " + server, Project.MSG_VERBOSE);
 
             ftp = new FTPClient();
-            configure(ftp);
+            if (this.isConfigurationSet) {
+                ftp = FTPConfigurator.configure(ftp, this);
+            }
 
             ftp.connect(server, port);
             if (!FTPReply.isPositiveCompletion(ftp.getReplyCode())) {