Return-Path: Delivered-To: apmail-ant-dev-archive@www.apache.org Received: (qmail 48801 invoked from network); 13 May 2005 10:34:54 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (209.237.227.199) by minotaur.apache.org with SMTP; 13 May 2005 10:34:54 -0000 Received: (qmail 36303 invoked by uid 500); 13 May 2005 10:39:01 -0000 Delivered-To: apmail-ant-dev-archive@ant.apache.org Received: (qmail 36225 invoked by uid 500); 13 May 2005 10:38:59 -0000 Mailing-List: contact dev-help@ant.apache.org; run by ezmlm Precedence: bulk List-Unsubscribe: List-Help: List-Post: List-Id: "Ant Developers List" Reply-To: "Ant Developers List" Delivered-To: mailing list dev@ant.apache.org Received: (qmail 36198 invoked by uid 500); 13 May 2005 10:38:59 -0000 Received: (qmail 36183 invoked by uid 99); 13 May 2005 10:38:59 -0000 X-ASF-Spam-Status: No, hits=0.2 required=10.0 tests=NO_REAL_NAME X-Spam-Check-By: apache.org Received: from minotaur.apache.org (HELO minotaur.apache.org) (209.237.227.194) by apache.org (qpsmtpd/0.28) with SMTP; Fri, 13 May 2005 03:38:59 -0700 Received: (qmail 48574 invoked by uid 1632); 13 May 2005 10:34:41 -0000 Date: 13 May 2005 10:34:41 -0000 Message-ID: <20050513103441.48573.qmail@minotaur.apache.org> From: scohen@apache.org To: ant-cvs@apache.org Subject: cvs commit: ant/src/main/org/apache/tools/ant/taskdefs/optional/net FTP.java X-Virus-Checked: Checked X-Spam-Rating: minotaur.apache.org 1.6.2 0/1000/N scohen 2005/05/13 03:34:40 Modified: src/main/org/apache/tools/ant/taskdefs/optional/net FTP.java Log: improve clarity of what FTPConfigurator is doing. Revision Changes Path 1.70 +3 -7 ant/src/main/org/apache/tools/ant/taskdefs/optional/net/FTP.java Index: FTP.java =================================================================== RCS file: /home/cvs/ant/src/main/org/apache/tools/ant/taskdefs/optional/net/FTP.java,v retrieving revision 1.69 retrieving revision 1.70 diff -u -r1.69 -r1.70 --- FTP.java 13 May 2005 10:26:20 -0000 1.69 +++ FTP.java 13 May 2005 10:34:40 -0000 1.70 @@ -2067,12 +2067,6 @@ } } - private void configure(FTPClient ftp) { - if (this.isConfigurationSet) { - FTPConfigurator.configure(ftp, this); - } - } - /** * Runs the task. * @@ -2088,7 +2082,9 @@ 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())) { --------------------------------------------------------------------- To unsubscribe, e-mail: dev-unsubscribe@ant.apache.org For additional commands, e-mail: dev-help@ant.apache.org