You are viewing a plain text version of this content. The canonical link for it is here.
Posted to java-dev@axis.apache.org by di...@apache.org on 2003/09/11 01:01:46 UTC

cvs commit: ws-axis/java/tools/org/apache/axis/tools/ant/foreach ForeachTask.java

dims        2003/09/10 16:01:46

  Modified:    java/tools/org/apache/axis/tools/ant/foreach
                        ForeachTask.java
  Log:
  Trying a fix for Gump Failure as suggested by Ant Team
  ("You'll have to stop reusing the Ant instance in ForEach" - http://marc.theaimsgroup.com/?l=axis-dev&m=106323034310935&w=2)
  
  Revision  Changes    Path
  1.11      +4 -4      ws-axis/java/tools/org/apache/axis/tools/ant/foreach/ForeachTask.java
  
  Index: ForeachTask.java
  ===================================================================
  RCS file: /home/cvs/ws-axis/java/tools/org/apache/axis/tools/ant/foreach/ForeachTask.java,v
  retrieving revision 1.10
  retrieving revision 1.11
  diff -u -r1.10 -r1.11
  --- ForeachTask.java	11 Dec 2002 22:42:53 -0000	1.10
  +++ ForeachTask.java	10 Sep 2003 23:01:46 -0000	1.11
  @@ -183,7 +183,7 @@
       }
   
       private void executeForkedAntTask() {
  -        if (callee == null) {
  +        /* if (callee2 == null) { */
               callee2 = (Java) getProject().createTask("java");
               callee2.setOwningTarget(getOwningTarget());
               callee2.setTaskName(getTaskName());
  @@ -191,7 +191,7 @@
               callee2.setClassname("org.apache.tools.ant.Main");
               callee2.setAppend(true);
               callee2.setFork(true);
  -        }
  +        /* }                      */
           String systemClassPath = System.getProperty("java.class.path");
           callee2.setClasspath(new Path(getProject(), systemClassPath));
           String args = "-buildfile " + properties.get("file");
  @@ -206,12 +206,12 @@
       }
   
       private void executeAntTask() {
  -        if (callee == null) {
  +        /* if (callee == null) { */
               callee = (Ant) getProject().createTask("ant");
               callee.setOwningTarget(getOwningTarget());
               callee.setTaskName(getTaskName());
               callee.init();
  -        }
  +        /* }                     */
   
           callee.setAntfile(getProject().getProperty("ant.file"));
           callee.setTarget(subTarget);