diff --git a/src/main/org/apache/tools/ant/DirectoryScanner.java b/src/main/org/apache/tools/ant/DirectoryScanner.java index e0af6613e..3f6e214fe 100644 --- a/src/main/org/apache/tools/ant/DirectoryScanner.java +++ b/src/main/org/apache/tools/ant/DirectoryScanner.java @@ -422,7 +422,7 @@ public class DirectoryScanner * @since Ant 1.6 */ public static void resetDefaultExcludes() { - defaultExcludes = new Vector(); + defaultExcludes = new Vector(); for (int i = 0; i < DEFAULTEXCLUDES.length; i++) { defaultExcludes.add(DEFAULTEXCLUDES[i]); diff --git a/src/main/org/apache/tools/ant/IntrospectionHelper.java b/src/main/org/apache/tools/ant/IntrospectionHelper.java index cd3f8d750..f21235f85 100644 --- a/src/main/org/apache/tools/ant/IntrospectionHelper.java +++ b/src/main/org/apache/tools/ant/IntrospectionHelper.java @@ -414,7 +414,7 @@ public final class IntrospectionHelper implements BuildListener { return true; } - if ("setTaskType".equals(name) + if ("setTaskType".equals(name) && java.lang.String.class.equals(type)) { return true; } @@ -453,7 +453,8 @@ public final class IntrospectionHelper implements BuildListener { * * @return a helper for the specified class */ - public static synchronized IntrospectionHelper getHelper(Project p, Class c) { + public static synchronized IntrospectionHelper getHelper(Project p, + Class c) { IntrospectionHelper ih = (IntrospectionHelper) helpers.get(c); if (ih == null) { ih = new IntrospectionHelper(c); @@ -1113,8 +1114,7 @@ public final class IntrospectionHelper implements BuildListener { Class elementClass = nestedCreator.getElementClass(); ComponentHelper helper = ComponentHelper.getComponentHelper(project); - nestedObject = ComponentHelper.getComponentHelper(project) - .createComponent(polyType); + nestedObject = helper.createComponent(polyType); if (nestedObject == null) { throw new BuildException( "Unable to create object of type " + polyType); diff --git a/src/main/org/apache/tools/ant/ProjectHelper.java b/src/main/org/apache/tools/ant/ProjectHelper.java index 3540145fb..f8fde4316 100644 --- a/src/main/org/apache/tools/ant/ProjectHelper.java +++ b/src/main/org/apache/tools/ant/ProjectHelper.java @@ -309,7 +309,7 @@ public class ProjectHelper { for (int i = 0; i < attrs.getLength(); i++) { // reflect these into the target String value = replaceProperties(project, attrs.getValue(i), - project.getProperties()); + project.getProperties()); try { ih.setAttribute(project, target, attrs.getName(i).toLowerCase(Locale.US), value);