conor       2004/02/02 06:52:02

  Modified:    src/main/org/apache/tools/ant/launch Tag: ANT_16_BRANCH
                        Launcher.java
  Log:
  Merge
  
  Revision  Changes    Path
  No                   revision
  No                   revision
  1.5.2.5   +6 -1      ant/src/main/org/apache/tools/ant/launch/Launcher.java
  
  Index: Launcher.java
  ===================================================================
  RCS file: /home/cvs/ant/src/main/org/apache/tools/ant/launch/Launcher.java,v
  retrieving revision 1.5.2.4
  retrieving revision 1.5.2.5
  diff -u -w -u -r1.5.2.4 -r1.5.2.5
  --- Launcher.java     2 Oct 2003 04:58:15 -0000       1.5.2.4
  +++ Launcher.java     2 Feb 2004 14:52:02 -0000       1.5.2.5
  @@ -153,7 +153,12 @@
               StringTokenizer myTokenizer
                   = new StringTokenizer(libPath, 
System.getProperty("path.separator"));
               while (myTokenizer.hasMoreElements()) {
  -                File element = new File(myTokenizer.nextToken());
  +                String elementName = myTokenizer.nextToken();
  +                File element = new File(elementName);
  +                if (elementName.startsWith("%") && elementName.endsWith("%") 
  +                    && !element.exists()) {
  +                    continue;
  +                }
                   if (element.isDirectory()) {
                       // add any jars in the directory
                       URL[] dirURLs = Locator.getLocationURLs(element);
  
  
  

---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]

Reply via email to