Browse Source

It is legal to omit the target attribute in <ant>, don't die with a NPE

git-svn-id: https://svn.apache.org/repos/asf/ant/core/trunk@275211 13f79535-47bb-0310-9956-ffa450edef68
master
Stefan Bodewig 22 years ago
parent
commit
7b90e493e8
1 changed files with 17 additions and 10 deletions
  1. +17
    -10
      src/main/org/apache/tools/ant/taskdefs/Ant.java

+ 17
- 10
src/main/org/apache/tools/ant/taskdefs/Ant.java View File

@@ -365,9 +365,7 @@ public class Ant extends Task {
.equals(getProject().getProperty("ant.file"))
&& getOwningTarget() != null) {

String owningTargetName = getOwningTarget().getName();

if (owningTargetName.equals("")) {
if (getOwningTarget().getName().equals("")) {
if (getTaskName().equals("antcall")) {
throw new BuildException("antcall must not be used at"
+ " the top level.");
@@ -376,7 +374,22 @@ public class Ant extends Task {
+ " top level must not invoke"
+ " its own build file.");
}
} else if (owningTargetName.equals(target)) {
}
}

ProjectHelper.configureProject(newProject, new File(antFile));

if (target == null) {
target = newProject.getDefaultTarget();
}

if (newProject.getProperty("ant.file")
.equals(getProject().getProperty("ant.file"))
&& getOwningTarget() != null) {

String owningTargetName = getOwningTarget().getName();

if (owningTargetName.equals(target)) {
throw new BuildException(getTaskName() + " task calling "
+ "its own parent target.");
} else {
@@ -393,12 +406,6 @@ public class Ant extends Task {
}
}

ProjectHelper.configureProject(newProject, new File(antFile));

if (target == null) {
target = newProject.getDefaultTarget();
}

addReferences();

if (target != null) {


Loading…
Cancel
Save