From 057958d82330a66a589e8bf14faf06ea2a307a83 Mon Sep 17 00:00:00 2001
From: Stephane Bailliez <sbailliez@apache.org>
Date: Fri, 3 Aug 2001 20:47:33 +0000
Subject: [PATCH] Fixed the stupid mistake I did when merging my last changes.
 I mistakenly removed part of a previous patch. Shame on me.

git-svn-id: https://svn.apache.org/repos/asf/ant/core/trunk@269457 13f79535-47bb-0310-9956-ffa450edef68
---
 src/main/org/apache/tools/ant/types/CommandlineJava.java | 8 ++------
 1 file changed, 2 insertions(+), 6 deletions(-)

diff --git a/src/main/org/apache/tools/ant/types/CommandlineJava.java b/src/main/org/apache/tools/ant/types/CommandlineJava.java
index 89d0464f0..52071c13e 100644
--- a/src/main/org/apache/tools/ant/types/CommandlineJava.java
+++ b/src/main/org/apache/tools/ant/types/CommandlineJava.java
@@ -139,15 +139,11 @@ public class CommandlineJava implements Cloneable {
 
     }
 
-
     public CommandlineJava() {
         setVm(getJavaExecutableName());
         setVmversion(Project.getJavaVersion());
     }
 
-    /**
-     * cr
-     */
     public Commandline.Argument createArgument() {
         return javaCommand.createArgument();
     }
@@ -227,7 +223,7 @@ public class CommandlineJava implements Cloneable {
     public String[] getCommandline() {
        String[] result = new String[size()];
         int pos = 0;
-        String[] vmArgs = vmCommand.getCommandline();
+        String[] vmArgs = getActualVMCommand().getCommandline();
         // first argument is the java.exe path...
         result[pos++] = vmArgs[0];
         
@@ -287,7 +283,7 @@ public class CommandlineJava implements Cloneable {
      * @see #getCommandline()
      */
     public int size() {
-        int size = vmCommand.size() + javaCommand.size() + sysProperties.size();
+        int size = getActualVMCommand().size() + javaCommand.size() + sysProperties.size();
         // classpath is "-classpath <classpath>" -> 2 args
         if (classpath != null && classpath.size() > 0) {
             size += 2;