ant-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From sco...@apache.org
Subject cvs commit: ant/src/main/org/apache/tools/ant/taskdefs/optional/net FTP.java
Date Fri, 13 May 2005 10:34:41 GMT
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


Mime
View raw message