Return-Path: <conor@apache.org>
Mailing-List: contact dev-help@ant.apache.org; run by ezmlm
Delivered-To: mailing list dev@ant.apache.org
Received: (qmail 85557 invoked by uid 500); 21 Feb 2003 10:44:44 -0000
Received: (qmail 85554 invoked from network); 21 Feb 2003 10:44:44 -0000
Received: from icarus.apache.org (208.185.179.13)
  by daedalus.apache.org with SMTP; 21 Feb 2003 10:44:44 -0000
Received: (qmail 20041 invoked by uid 1142); 21 Feb 2003 10:44:42 -0000
Date: 21 Feb 2003 10:44:42 -0000
Message-ID: <20030221104442.20040.qmail@icarus.apache.org>
From: conor@apache.org
To: ant-cvs@apache.org
Subject: cvs commit: ant/src/main/org/apache/tools/ant/taskdefs/optional/net
 FTP.java
X-Spam-Rating: daedalus.apache.org 1.6.2 0/1000/N

conor       2003/02/21 02:44:42

  Modified:    src/main/org/apache/tools/ant/taskdefs/optional/net Tag:
                        ANT_15_BRANCH FTP.java
  Log:
  Merge
  
  Revision  Changes    Path
  No                   revision
  
  
  No                   revision
  
  
  1.21.2.7  +11 -10    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.21.2.6
  retrieving revision 1.21.2.7
  diff -u -w -u -r1.21.2.6 -r1.21.2.7
  --- FTP.java	21 Feb 2003 09:45:42 -0000	1.21.2.6
  +++ FTP.java	21 Feb 2003 10:44:42 -0000	1.21.2.7
  @@ -604,28 +604,29 @@
       protected void createParents(FTPClient ftp, String filename)
            throws IOException, BuildException {
   
  -        String cwd = ftp.printWorkingDirectory();
  +        File dir = new File(filename);
  +        if (dirCache.contains(dir)) {
  +            return;
  +        }
  +
           
           Vector parents = new Vector();
  -        File dir = new File(filename);
           String dirname;
   
           while ((dirname = dir.getParent()) != null) {
  -            dir = new File(dirname);
  +            File checkDir = new File(dirname);
  +            if (dirCache.contains(checkDir)) {
  +                break;
  +            }
  +            dir = checkDir;
               parents.addElement(dir);
           }
   
           // find first non cached dir
           int i = parents.size() - 1;
  -        while (i >= 0) {
  -            dir = (File) parents.elementAt(i);
  -            if (!dirCache.contains(dir)) {
  -                break;
  -            }
  -            i--;
  -        }
                   
           if (i >= 0) {
  +            String cwd = ftp.printWorkingDirectory();
               String parent = dir.getParent();
               if (parent != null) {
                   if (!ftp.changeWorkingDirectory(parent)) {