From 193919c329fa321ecc79324cec4ee98ba61160c8 Mon Sep 17 00:00:00 2001
From: Stefan Bodewig <bodewig@apache.org>
Date: Thu, 13 Nov 2008 16:05:47 +0000
Subject: [PATCH] make sure prefix isn't set to project name in import.  make
 sure it is set even when no target has been encountered in include.

git-svn-id: https://svn.apache.org/repos/asf/ant/core/trunk@713745 13f79535-47bb-0310-9956-ffa450edef68
---
 docs/manual/CoreTasks/include.html                  |  3 +++
 .../org/apache/tools/ant/helper/ProjectHelper2.java | 13 ++++++++-----
 2 files changed, 11 insertions(+), 5 deletions(-)

diff --git a/docs/manual/CoreTasks/include.html b/docs/manual/CoreTasks/include.html
index 5afa06748..729741e73 100644
--- a/docs/manual/CoreTasks/include.html
+++ b/docs/manual/CoreTasks/include.html
@@ -74,6 +74,9 @@ that are not possible with entity includes:
   "b", then the targets of that last build file will be prefixed by
   "a.b.".</p>
 
+<p><code>&lt;import&gt;</code> contribute to the prefix as well, but
+  only if their <code>as</code> attribute has been specified.
+
 <h4>Special Properties</h4>
 
 <p>Included files are treated as they are present in the main
diff --git a/src/main/org/apache/tools/ant/helper/ProjectHelper2.java b/src/main/org/apache/tools/ant/helper/ProjectHelper2.java
index 831a7d685..606026747 100644
--- a/src/main/org/apache/tools/ant/helper/ProjectHelper2.java
+++ b/src/main/org/apache/tools/ant/helper/ProjectHelper2.java
@@ -687,6 +687,14 @@ public class ProjectHelper2 extends ProjectHelper {
                         if (!context.isIgnoringProjectTag()) {
                             project.setName(value);
                             project.addReference(value, project);
+                        } else if (isInIncludeMode()) {
+                            if (!"".equals(value)
+                                && (getCurrentTargetPrefix() == null
+                                    || getCurrentTargetPrefix().length() == 0)
+                                ) {
+                                // help nested include tasks
+                                setCurrentTargetPrefix(value);
+                            }
                         }
                     }
                 } else if (key.equals("id")) {
@@ -918,11 +926,6 @@ public class ProjectHelper2 extends ProjectHelper {
                 projectName = null;
             }
 
-            // help nested include tasks
-            if (projectName != null) {
-                setCurrentTargetPrefix(projectName);
-            }
-
             return projectName;
         }