diff --git a/proposal/xdocs/src/org/apache/ant/xdoclet/TaskTagsHandler.java b/proposal/xdocs/src/org/apache/ant/xdoclet/TaskTagsHandler.java
index 21307bdfb..adbff6ff0 100644
--- a/proposal/xdocs/src/org/apache/ant/xdoclet/TaskTagsHandler.java
+++ b/proposal/xdocs/src/org/apache/ant/xdoclet/TaskTagsHandler.java
@@ -599,7 +599,7 @@ public class TaskTagsHandler extends XDocletTagSupport
             attributeMethods.add(method);
         }
 
-        return (XMethod[]) attributeMethods.toArray(new XMethod[0]);
+        return (XMethod[]) attributeMethods.toArray(new XMethod[attributeMethods.size()]);
     }
 
     /**
@@ -708,7 +708,7 @@ public class TaskTagsHandler extends XDocletTagSupport
             elementMethods.add(method);
         }
 
-        return (XMethod[]) elementMethods.toArray(new XMethod[0]);
+        return (XMethod[]) elementMethods.toArray(new XMethod[elementMethods.size()]);
     }
 
     /**
@@ -849,7 +849,7 @@ public class TaskTagsHandler extends XDocletTagSupport
                 }
             });
 
-        return (XMethod[]) methods.toArray(new XMethod[0]);
+        return (XMethod[]) methods.toArray(new XMethod[methods.size()]);
     }
 }
 
diff --git a/src/main/org/apache/tools/ant/types/CommandlineJava.java b/src/main/org/apache/tools/ant/types/CommandlineJava.java
index 8d1524161..2e8bea7e3 100644
--- a/src/main/org/apache/tools/ant/types/CommandlineJava.java
+++ b/src/main/org/apache/tools/ant/types/CommandlineJava.java
@@ -91,7 +91,7 @@ public class CommandlineJava implements Cloneable {
             if (definitions.size() == 0) {
                 return null;
             } else {
-                return (String[]) definitions.toArray(new String[0]);
+                return (String[]) definitions.toArray(new String[definitions.size()]);
             }
         }
 
@@ -397,7 +397,7 @@ public class CommandlineJava implements Cloneable {
         //fill it
         addCommandsToList(listIterator);
         //convert to an array
-        return (String[]) commands.toArray(new String[0]);
+        return (String[]) commands.toArray(new String[commands.size()]);
     }
 
     /**