cvs commit: cocoon-2.1/tools/src/anttasks XConfToolTask.java

[bruno]

bruno       2004/01/31 07:55:06

  Modified:    tools/src/anttasks XConfToolTask.java
  Log:
  Fixed an exception occuring when using xpatch from maven.xml.
  The property lookup was eventually delegated to System.getProperty,
  which gives an exception on empty keys.
  
  Revision  Changes    Path
  1.12      +4 -2      cocoon-2.1/tools/src/anttasks/XConfToolTask.java
  
  Index: XConfToolTask.java
  ===================================================================
  RCS file: /home/cvs/cocoon-2.1/tools/src/anttasks/XConfToolTask.java,v
  retrieving revision 1.11
  retrieving revision 1.12
  diff -u -r1.11 -r1.12
  --- XConfToolTask.java        21 Jan 2004 17:05:09 -0000      1.11
  +++ XConfToolTask.java        31 Jan 2004 15:55:06 -0000      1.12
  @@ -272,7 +272,9 @@
           }
           // Is if-path needed?
           String ifProp = getAttribute(elem, "if-prop", replaceProperties);
  -        boolean ifValue = 
Boolean.valueOf(project.getProperty(ifProp)).booleanValue();
  +        boolean ifValue = false;
  +        if (ifProp != null && !ifProp.equals(""))
  +            Boolean.valueOf(project.getProperty(ifProp)).booleanValue();
   
           if (ifProp != null && (ifProp.length()>0) && !ifValue ) {
               log("Skipping: " + file, Project.MSG_DEBUG);