Author: peterreilly
Date: Fri Sep 29 15:23:38 2006
New Revision: 451479
URL: http://svn.apache.org/viewvc?view=rev&rev=451479
Log:
UnknownElement.maybeconfigure was 'always configure': Bugzilla 40641
Modified:
ant/core/trunk/WHATSNEW
ant/core/trunk/src/main/org/apache/tools/ant/UnknownElement.java
Modified: ant/core/trunk/WHATSNEW
URL:
http://svn.apache.org/viewvc/ant/core/trunk/WHATSNEW?view=diff&rev=451479&r1=451478&r2=451479
==============================================================================
--- ant/core/trunk/WHATSNEW (original)
+++ ant/core/trunk/WHATSNEW Fri Sep 29 15:23:38 2006
@@ -29,6 +29,9 @@
* <xmlproperty> did not create properties for empty leaf elements.
Bugzilla report 26286.
+* UnknownElement.maybeConfigure always configured.
+ Bugzilla report 40641.
+
Other changes:
--------------
Modified: ant/core/trunk/src/main/org/apache/tools/ant/UnknownElement.java
URL:
http://svn.apache.org/viewvc/ant/core/trunk/src/main/org/apache/tools/ant/UnknownElement.java?view=diff&rev=451479&r1=451478&r2=451479
==============================================================================
--- ant/core/trunk/src/main/org/apache/tools/ant/UnknownElement.java (original)
+++ ant/core/trunk/src/main/org/apache/tools/ant/UnknownElement.java Fri Sep 29
15:23:38 2006
@@ -152,10 +152,9 @@
* @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()));
}
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
