svn commit: r1061156 - /ant/core/trunk/src/main/org/apache/tools/ant/types/CommandlineJava.java

[bodewig]

Author: bodewig
Date: Thu Jan 20 08:25:35 2011
New Revision: 1061156

URL: http://svn.apache.org/viewvc?rev=1061156&view=rev
Log:
Give build.sysclasspath a chance to influence a forked VM's bootclasspath even 
if the user didn't supply one herself

Modified:
    ant/core/trunk/src/main/org/apache/tools/ant/types/CommandlineJava.java

Modified: 
ant/core/trunk/src/main/org/apache/tools/ant/types/CommandlineJava.java
URL: 
http://svn.apache.org/viewvc/ant/core/trunk/src/main/org/apache/tools/ant/types/CommandlineJava.java?rev=1061156&r1=1061155&r2=1061156&view=diff
==============================================================================
--- ant/core/trunk/src/main/org/apache/tools/ant/types/CommandlineJava.java 
(original)
+++ ant/core/trunk/src/main/org/apache/tools/ant/types/CommandlineJava.java Thu 
Jan 20 08:25:35 2011
@@ -678,13 +678,14 @@ public class CommandlineJava implements 
                                   + "the target VM doesn't support it.");
             }
         } else {
-            if (bootclasspath != null) {
-                return bootclasspath.concatSystemBootClasspath(isCloneVm()
-                                                               ? "last"
-                                                               : "ignore");
-            } else if (isCloneVm()) {
-                return Path.systemBootClasspath;
+            Path b = bootclasspath;
+            if (b == null) {
+                b = new Path(null);
             }
+            // even with no user-supplied bootclasspath
+            // build.sysclasspath could be set to something other than
+            // "ignore" and thus create one
+            return b.concatSystemBootClasspath(isCloneVm() ? "last" : 
"ignore");
         }
         return new Path(null);
     }