From 7b90e493e8f5388bf88f0d951880d6667f9a8016 Mon Sep 17 00:00:00 2001
From: Stefan Bodewig <bodewig@apache.org>
Date: Wed, 10 Sep 2003 13:17:00 +0000
Subject: [PATCH] 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
---
 .../org/apache/tools/ant/taskdefs/Ant.java    | 27 ++++++++++++-------
 1 file changed, 17 insertions(+), 10 deletions(-)

diff --git a/src/main/org/apache/tools/ant/taskdefs/Ant.java b/src/main/org/apache/tools/ant/taskdefs/Ant.java
index 19738e5f3..bb631c075 100644
--- a/src/main/org/apache/tools/ant/taskdefs/Ant.java
+++ b/src/main/org/apache/tools/ant/taskdefs/Ant.java
@@ -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) {