bodewig     2005/04/15 01:11:09

  Modified:    src/main/org/apache/tools/ant/taskdefs Tag: ANT_16_BRANCH
                        Java.java
  Log:
  merge
  
  Revision  Changes    Path
  No                   revision
  No                   revision
  1.77.2.14 +4 -1      ant/src/main/org/apache/tools/ant/taskdefs/Java.java
  
  Index: Java.java
  ===================================================================
  RCS file: /home/cvs/ant/src/main/org/apache/tools/ant/taskdefs/Java.java,v
  retrieving revision 1.77.2.13
  retrieving revision 1.77.2.14
  diff -u -r1.77.2.13 -r1.77.2.14
  --- Java.java 18 Mar 2005 17:29:31 -0000      1.77.2.13
  +++ Java.java 15 Apr 2005 08:11:09 -0000      1.77.2.14
  @@ -182,6 +182,9 @@
                   }
               }
           } catch (BuildException e) {
  +            if (e.getLocation() == null && getLocation() != null) {
  +                e.setLocation(getLocation());
  +            }
               if (failOnError) {
                   throw e;
               } else {
  @@ -190,7 +193,7 @@
               }
           } catch (Throwable t) {
               if (failOnError) {
  -                throw new BuildException(t);
  +                throw new BuildException(t, getLocation());
               } else {
                   log(t);
                   return 0;
  
  
  

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

Reply via email to