You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@ant.apache.org by co...@apache.org on 2004/02/02 15:46:52 UTC

cvs commit: ant/src/main/org/apache/tools/ant/launch Launcher.java

conor       2004/02/02 06:46:52

  Modified:    src/main/org/apache/tools/ant/launch Launcher.java
  Log:
  Handle unexpanded properties in Windows CLASSPATHS
  
  Revision  Changes    Path
  1.10      +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.9
  retrieving revision 1.10
  diff -u -w -u -r1.9 -r1.10
  --- Launcher.java	2 Oct 2003 06:44:27 -0000	1.9
  +++ Launcher.java	2 Feb 2004 14:46:52 -0000	1.10
  @@ -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: dev-unsubscribe@ant.apache.org
For additional commands, e-mail: dev-help@ant.apache.org