Author: peterreilly
Date: Tue Sep 19 13:53:19 2006
New Revision: 447966
URL: http://svn.apache.org/viewvc?view=rev&rev=447966
Log:
Bugzilla 40547: <path location='x'> was broken
Modified:
ant/core/trunk/WHATSNEW
ant/core/trunk/src/main/org/apache/tools/ant/IntrospectionHelper.java
Modified: ant/core/trunk/WHATSNEW
URL:
http://svn.apache.org/viewvc/ant/core/trunk/WHATSNEW?view=diff&rev=447966&r1=447965&r2=447966
==============================================================================
--- ant/core/trunk/WHATSNEW (original)
+++ ant/core/trunk/WHATSNEW Tue Sep 19 13:53:19 2006
@@ -12,6 +12,9 @@
* <checksum> with file and todir option failed. Bugzilla report 37386.
+* <path location="loc"> was broken (Regression from beta1).
+ Bugzilla report 40547.
+
Other changes:
--------------
Modified: ant/core/trunk/src/main/org/apache/tools/ant/IntrospectionHelper.java
URL:
http://svn.apache.org/viewvc/ant/core/trunk/src/main/org/apache/tools/ant/IntrospectionHelper.java?view=diff&rev=447966&r1=447965&r2=447966
==============================================================================
--- ant/core/trunk/src/main/org/apache/tools/ant/IntrospectionHelper.java
(original)
+++ ant/core/trunk/src/main/org/apache/tools/ant/IntrospectionHelper.java Tue
Sep 19 13:53:19 2006
@@ -168,7 +168,6 @@
*/
private IntrospectionHelper(final Class bean) {
this.bean = bean;
-
Method[] methods = bean.getMethods();
for (int i = 0; i < methods.length; i++) {
final Method m = methods[i];
@@ -199,7 +198,6 @@
} else if (name.startsWith("set")
&& java.lang.Void.TYPE.equals(returnType)
&& args.length == 1 && !args[0].isArray()) {
-
String propName = getPropertyName(name, "set");
if (attributeSetters.get(propName) != null) {
if (java.lang.String.class.equals(args[0])) {
@@ -211,8 +209,17 @@
*/
continue;
}
+ if (org.apache.tools.ant.Location.class.equals(args[0])) {
+ /*
+ Ignore setLocation(Location) (normally from
+ ProjectComponent.setLocation(Location) in honour
+ of setLocation(Some other class)
+ */
+ continue;
+ }
/*
- If the argument is not a String, and if there
+ If the argument is not a String or Location,
+ and if there
is an overloaded form of this method already defined,
we just override that with the new one.
This mechanism does not guarantee any specific order
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
