mbenson     2005/04/12 10:18:30

  Modified:    src/main/org/apache/tools/ant UnknownElement.java
  Log:
  When getting the real object from UE, do not call Task.init() on the Object
  returned from ComponentHelper as init() has been called in createComponent().
  PR: 34411
  
  Revision  Changes    Path
  1.89      +2 -3      ant/src/main/org/apache/tools/ant/UnknownElement.java
  
  Index: UnknownElement.java
  ===================================================================
  RCS file: /home/cvs/ant/src/main/org/apache/tools/ant/UnknownElement.java,v
  retrieving revision 1.88
  retrieving revision 1.89
  diff -u -r1.88 -r1.89
  --- UnknownElement.java       29 Mar 2005 21:47:59 -0000      1.88
  +++ UnknownElement.java       12 Apr 2005 17:18:29 -0000      1.89
  @@ -414,15 +414,14 @@
                   Task task = (Task) o;
                   task.setTaskType(ue.getTaskType());
                   task.setTaskName(ue.getTaskName());
  +                task.init();
               }
           }
           if (o instanceof UnknownElement) {
               o = ((UnknownElement) o).makeObject((UnknownElement) o, w);
           }
           if (o instanceof Task) {
  -            Task task = (Task) o;
  -            task.setOwningTarget(getOwningTarget());
  -            task.init();
  +            ((Task) o).setOwningTarget(getOwningTarget());
           }
           return o;
       }
  
  
  

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

Reply via email to