From 4c27dd164838125b2fb56d00cc257068915a4f73 Mon Sep 17 00:00:00 2001 From: Stefan Bodewig Date: Thu, 30 Nov 2000 17:40:19 +0000 Subject: [PATCH] Partially revert the last patch as it made taskdef work by breaking property. Now everything is as it has been before, including the failing taskdef. git-svn-id: https://svn.apache.org/repos/asf/ant/core/trunk@268282 13f79535-47bb-0310-9956-ffa450edef68 --- .../org/apache/tools/ant/ProjectHelper.java | 20 ++++--------------- 1 file changed, 4 insertions(+), 16 deletions(-) diff --git a/src/main/org/apache/tools/ant/ProjectHelper.java b/src/main/org/apache/tools/ant/ProjectHelper.java index 6affa21e9..b06d78700 100644 --- a/src/main/org/apache/tools/ant/ProjectHelper.java +++ b/src/main/org/apache/tools/ant/ProjectHelper.java @@ -223,12 +223,6 @@ public class ProjectHelper { * Handler for the top level "project" element. */ private class ProjectHandler extends AbstractHandler { - /** - * Tasks not living in a target need special processing - * in endElement (this is the right place to call execute). - */ - protected TaskHandler childHandler = null; - public ProjectHandler(DocumentHandler parentHandler) { super(parentHandler); } @@ -297,13 +291,15 @@ public class ProjectHelper { } private void handleTaskdef(String name, AttributeList attrs) throws SAXParseException { - childHandler = new TaskHandler(this, null); + TaskHandler childHandler = new TaskHandler(this, null); childHandler.init(name, attrs); + childHandler.finished(); } private void handleProperty(String name, AttributeList attrs) throws SAXParseException { - childHandler = new TaskHandler(this, null); + TaskHandler childHandler = new TaskHandler(this, null); childHandler.init(name, attrs); + childHandler.finished(); } private void handleTarget(String tag, AttributeList attrs) throws SAXParseException { @@ -314,14 +310,6 @@ public class ProjectHelper { new DataTypeHandler(this).init(name, attrs); } - public void endElement(String name) throws SAXException { - if (childHandler != null) { - childHandler.finished(); - childHandler = null; - } - - super.endElement(name); - } } /**