bug #36171; -noclasspath crashes ant if no system classpath is set.

submitted by Benjamin Burgess


git-svn-id: https://svn.apache.org/repos/asf/ant/core/trunk@278540 13f79535-47bb-0310-9956-ffa450edef68

CONTRIBUTORS

@@ -14,6 +14,7 @@ Aslak Helles�y
 Atsuhiko Yamanaka
 Avik Sengupta
 Balazs Fejes 2
+Benjamin Burgess
 Ben Galbraith
 Benoit Moussaud
 Brad Clark

WHATSNEW

@@ -132,6 +132,9 @@ Fixed bugs:
 
 * off-by-one error in environment setup for execution under OpenVMS fixed.
 
+* Bugzilla report 36171: -noclasspath crashes ant if no system classpath is set. 
+
+
 Other changes:
 --------------
 

contributors.xml

@@ -72,7 +72,11 @@
 		<first>Balazs</first>
 		<last>Fejes 2</last>
 	</name>
-	<name>
+  <name>
+    <first>Benjamin</first>
+    <last>Burgess</last>
+  </name>
+  <name>
 		<first>Ben</first>
 		<last>Galbraith</last>
 	</name>

src/main/org/apache/tools/ant/launch/Launcher.java

@@ -186,8 +186,7 @@ public class Launcher {
         //decide whether to copy the existing arg set, or
         //build a new one from the list of all args excluding the special
         //operations that only we handle
-
-        if (libPaths.size() == 0 && cpString == null) {
+        if (argList.size() == args.length) {
             newArgs = args;
         } else {
             newArgs = (String[]) argList.toArray(new String[argList.size()]);