sbailliez 01/08/03 13:47:33
Modified: src/main/org/apache/tools/ant/types CommandlineJava.java
Log:
Fixed the stupid mistake I did when merging my last changes.
I mistakenly removed part of a previous patch. Shame on me.
Revision Changes Path
1.16 +2 -6
jakarta-ant/src/main/org/apache/tools/ant/types/CommandlineJava.java
Index: CommandlineJava.java
===================================================================
RCS file:
/home/cvs/jakarta-ant/src/main/org/apache/tools/ant/types/CommandlineJava.java,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- CommandlineJava.java 2001/08/02 21:51:00 1.15
+++ CommandlineJava.java 2001/08/03 20:47:33 1.16
@@ -139,15 +139,11 @@
}
-
public CommandlineJava() {
setVm(getJavaExecutableName());
setVmversion(Project.getJavaVersion());
}
- /**
- * cr
- */
public Commandline.Argument createArgument() {
return javaCommand.createArgument();
}
@@ -227,7 +223,7 @@
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 @@
* @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;
