From abf0a938406a5129f0db36e1fc9e73f7bf024122 Mon Sep 17 00:00:00 2001
From: Matthew Jason Benson <mbenson@apache.org>
Date: Tue, 9 Aug 2005 15:24:52 +0000
Subject: [PATCH] remove reflective toArray calls PR: 36092 Obtained from: Dave
 Brosius

git-svn-id: https://svn.apache.org/repos/asf/ant/core/trunk@278510 13f79535-47bb-0310-9956-ffa450edef68
---
 src/main/org/apache/tools/ant/launch/Launcher.java            | 4 ++--
 src/main/org/apache/tools/ant/taskdefs/PathConvert.java       | 2 +-
 src/main/org/apache/tools/ant/taskdefs/optional/Javah.java    | 2 +-
 .../tools/ant/taskdefs/optional/extension/Extension.java      | 4 ++--
 .../tools/ant/taskdefs/optional/extension/Specification.java  | 2 +-
 5 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/src/main/org/apache/tools/ant/launch/Launcher.java b/src/main/org/apache/tools/ant/launch/Launcher.java
index 6817fa103..b2c98b51d 100644
--- a/src/main/org/apache/tools/ant/launch/Launcher.java
+++ b/src/main/org/apache/tools/ant/launch/Launcher.java
@@ -174,7 +174,7 @@ public class Launcher {
         if (libPaths.size() == 0 && cpString == null) {
             newArgs = args;
         } else {
-            newArgs = (String[]) argList.toArray(new String[0]);
+            newArgs = (String[]) argList.toArray(new String[argList.size()]);
         }
 
         List libPathURLs = new ArrayList();
@@ -188,7 +188,7 @@ public class Launcher {
             addPath(libPath, true, libPathURLs);
         }
 
-        URL[] libJars = (URL[]) libPathURLs.toArray(new URL[0]);
+        URL[] libJars = (URL[]) libPathURLs.toArray(new URL[libPathURLs.size()]);
 
         // Now try and find JAVA_HOME
         File toolsJar = Locator.getToolsJar();
diff --git a/src/main/org/apache/tools/ant/taskdefs/PathConvert.java b/src/main/org/apache/tools/ant/taskdefs/PathConvert.java
index 2c8e5cb88..ee3528a36 100644
--- a/src/main/org/apache/tools/ant/taskdefs/PathConvert.java
+++ b/src/main/org/apache/tools/ant/taskdefs/PathConvert.java
@@ -341,7 +341,7 @@ public class PathConvert extends Task {
                         ret.add(mapped[m]);
                     }
                 }
-                elems = (String[]) ret.toArray(new String[] {});
+                elems = (String[]) ret.toArray(new String[ret.size()]);
             }
             for (int i = 0; i < elems.length; i++) {
                 String elem = mapElement(elems[i]); // Apply the path prefix map
diff --git a/src/main/org/apache/tools/ant/taskdefs/optional/Javah.java b/src/main/org/apache/tools/ant/taskdefs/optional/Javah.java
index c0dca95a4..279805063 100755
--- a/src/main/org/apache/tools/ant/taskdefs/optional/Javah.java
+++ b/src/main/org/apache/tools/ant/taskdefs/optional/Javah.java
@@ -149,7 +149,7 @@ public class Javah extends Task {
             ClassArgument arg = (ClassArgument) e.nextElement();
             al.add(arg.getName());
         }
-        return (String[]) al.toArray(new String[0]);
+        return (String[]) al.toArray(new String[al.size()]);
     }
 
     /**
diff --git a/src/main/org/apache/tools/ant/taskdefs/optional/extension/Extension.java b/src/main/org/apache/tools/ant/taskdefs/optional/extension/Extension.java
index 9f47b03dc..2dc07ed48 100644
--- a/src/main/org/apache/tools/ant/taskdefs/optional/extension/Extension.java
+++ b/src/main/org/apache/tools/ant/taskdefs/optional/extension/Extension.java
@@ -209,7 +209,7 @@ public final class Extension {
             }
         }
 
-        return (Extension[]) results.toArray(new Extension[0]);
+        return (Extension[]) results.toArray(new Extension[results.size()]);
     }
 
     /**
@@ -580,7 +580,7 @@ public final class Extension {
             getExtension(attributes, results, listKey);
         }
 
-        return (Extension[]) results.toArray(new Extension[ 0 ]);
+        return (Extension[]) results.toArray(new Extension[results.size()]);
     }
 
     /**
diff --git a/src/main/org/apache/tools/ant/taskdefs/optional/extension/Specification.java b/src/main/org/apache/tools/ant/taskdefs/optional/extension/Specification.java
index 03288c309..1a5aef6f3 100644
--- a/src/main/org/apache/tools/ant/taskdefs/optional/extension/Specification.java
+++ b/src/main/org/apache/tools/ant/taskdefs/optional/extension/Specification.java
@@ -183,7 +183,7 @@ public final class Specification {
         }
 
         final ArrayList trimmedResults = removeDuplicates(results);
-        return (Specification[]) trimmedResults.toArray(new Specification[0]);
+        return (Specification[]) trimmedResults.toArray(new Specification[trimmedResults.size()]);
     }
 
     /**