From 4b364736eef7f9740caba2130df3113462b1b612 Mon Sep 17 00:00:00 2001
From: Stefan Bodewig <bodewig@apache.org>
Date: Tue, 11 Nov 2008 09:50:51 +0000
Subject: [PATCH] deal with nested invokations

git-svn-id: https://svn.apache.org/repos/asf/ant/core/trunk@713007 13f79535-47bb-0310-9956-ffa450edef68
---
 src/main/org/apache/tools/ant/taskdefs/ImportTask.java | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/src/main/org/apache/tools/ant/taskdefs/ImportTask.java b/src/main/org/apache/tools/ant/taskdefs/ImportTask.java
index b029eef1d..d5d598acf 100644
--- a/src/main/org/apache/tools/ant/taskdefs/ImportTask.java
+++ b/src/main/org/apache/tools/ant/taskdefs/ImportTask.java
@@ -152,6 +152,9 @@ public class ImportTask extends Task {
             return;
         }
 
+        // nested invokations are possible like an imported file
+        // importing another one
+        String oldPrefix = ProjectHelper.getCurrentTargetPrefix();
         try {
             ProjectHelper.setCurrentTargetPrefix(targetPrefix);
             helper.parse(getProject(), importedFile);
@@ -159,8 +162,7 @@ public class ImportTask extends Task {
             throw ProjectHelper.addLocationToBuildException(
                 ex, getLocation());
         } finally {
-            ProjectHelper.setCurrentTargetPrefix(null);
+            ProjectHelper.setCurrentTargetPrefix(oldPrefix);
         }
     }
-
 }