Browse Source

Handle badly configured tasks created outside of Ant's core

PR:	6309


git-svn-id: https://svn.apache.org/repos/asf/ant/core/trunk@271348 13f79535-47bb-0310-9956-ffa450edef68
master
Conor MacNeill 24 years ago
parent
commit
2976ded16a
1 changed files with 5 additions and 2 deletions
  1. +5
    -2
      src/main/org/apache/tools/ant/XmlLogger.java

+ 5
- 2
src/main/org/apache/tools/ant/XmlLogger.java View File

@@ -197,7 +197,7 @@ public class XmlLogger implements BuildListener {
TimedElement poppedStack = (TimedElement)threadStack.pop();
if (poppedStack != targetElement) {
throw new RuntimeException("Mismatch - popped element = " + poppedStack.element +
" finished task element = " + targetElement.element);
" finished target element = " + targetElement.element);
}
if (!threadStack.empty()) {
parentElement = (TimedElement)threadStack.peek();
@@ -232,7 +232,10 @@ public class XmlLogger implements BuildListener {
long totalTime = System.currentTimeMillis() - taskElement.startTime;
taskElement.element.setAttribute(TIME_ATTR, DefaultLogger.formatTime(totalTime));
Target target = task.getOwningTarget();
TimedElement targetElement = (TimedElement)targets.get(target);
TimedElement targetElement = null;
if (target != null) {
targetElement = (TimedElement)targets.get(target);
}
if (targetElement == null) {
buildElement.element.appendChild(taskElement.element);
}


Loading…
Cancel
Save