From 135b0fa3736315ded38ba95dec6226db2e4a9a1c Mon Sep 17 00:00:00 2001
From: Peter Reilly <peterreilly@apache.org>
Date: Fri, 29 Sep 2006 22:23:38 +0000
Subject: [PATCH] UnknownElement.maybeconfigure was 'always configure':
 Bugzilla 40641

git-svn-id: https://svn.apache.org/repos/asf/ant/core/trunk@451479 13f79535-47bb-0310-9956-ffa450edef68
---
 WHATSNEW                                          | 3 +++
 src/main/org/apache/tools/ant/UnknownElement.java | 7 +++----
 2 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/WHATSNEW b/WHATSNEW
index 794ace806..f744295da 100644
--- a/WHATSNEW
+++ b/WHATSNEW
@@ -29,6 +29,9 @@ Fixed bugs:
 * <xmlproperty> did not create properties for empty leaf elements.
   Bugzilla report 26286.
 
+* UnknownElement.maybeConfigure always configured.
+  Bugzilla report 40641.
+
 Other changes:
 --------------
 
diff --git a/src/main/org/apache/tools/ant/UnknownElement.java b/src/main/org/apache/tools/ant/UnknownElement.java
index 31011c3d3..9f87109cd 100644
--- a/src/main/org/apache/tools/ant/UnknownElement.java
+++ b/src/main/org/apache/tools/ant/UnknownElement.java
@@ -152,10 +152,9 @@ public class UnknownElement extends Task {
      * @exception BuildException if the configuration fails
      */
     public void maybeConfigure() throws BuildException {
-        //ProjectComponentHelper helper=ProjectComponentHelper.getProjectComponentHelper();
-        //realThing = helper.createProjectComponent( this, getProject(), null,
-        //                                           this.getTag());
-
+        if (realThing != null) {
+            return;
+        }
         configure(makeObject(this, getWrapper()));
     }