git-svn-id: https://svn.apache.org/repos/asf/ant/core/trunk@270714 13f79535-47bb-0310-9956-ffa450edef68master
| @@ -9,6 +9,7 @@ package org.apache.tools.ant.types; | |||||
| import org.apache.myrmidon.api.TaskException; | import org.apache.myrmidon.api.TaskException; | ||||
| import org.apache.aut.nativelib.Os; | import org.apache.aut.nativelib.Os; | ||||
| import org.apache.avalon.excalibur.util.StringUtil; | |||||
| import java.io.File; | import java.io.File; | ||||
| /** | /** | ||||
| @@ -178,14 +179,6 @@ public class CommandlineJava | |||||
| sysProperties.addVariable( sysp ); | sysProperties.addVariable( sysp ); | ||||
| } | } | ||||
| /** | |||||
| * Clear out the java arguments. | |||||
| */ | |||||
| public void clearJavaArgs() | |||||
| { | |||||
| javaCommand.clearArgs(); | |||||
| } | |||||
| public Argument createArgument() | public Argument createArgument() | ||||
| { | { | ||||
| return javaCommand.createArgument(); | return javaCommand.createArgument(); | ||||
| @@ -239,7 +232,8 @@ public class CommandlineJava | |||||
| { | { | ||||
| try | try | ||||
| { | { | ||||
| return Commandline.toString( getCommandline() ); | |||||
| String[] line = getCommandline(); | |||||
| return StringUtil.join( line, " " ); | |||||
| } | } | ||||
| catch( TaskException e ) | catch( TaskException e ) | ||||
| { | { | ||||
| @@ -249,7 +243,8 @@ public class CommandlineJava | |||||
| private Commandline getActualVMCommand() | private Commandline getActualVMCommand() | ||||
| { | { | ||||
| Commandline actualVMCommand = (Commandline)vmCommand.clone(); | |||||
| Commandline actualVMCommand = new Commandline(); | |||||
| //(Commandline)vmCommand.clone(); | |||||
| if( maxMemory != null ) | if( maxMemory != null ) | ||||
| { | { | ||||
| actualVMCommand.createArgument().setValue( "-Xmx" + maxMemory ); | actualVMCommand.createArgument().setValue( "-Xmx" + maxMemory ); | ||||
| @@ -9,6 +9,7 @@ package org.apache.tools.ant.types; | |||||
| import org.apache.myrmidon.api.TaskException; | import org.apache.myrmidon.api.TaskException; | ||||
| import org.apache.aut.nativelib.Os; | import org.apache.aut.nativelib.Os; | ||||
| import org.apache.avalon.excalibur.util.StringUtil; | |||||
| import java.io.File; | import java.io.File; | ||||
| /** | /** | ||||
| @@ -178,14 +179,6 @@ public class CommandlineJava | |||||
| sysProperties.addVariable( sysp ); | sysProperties.addVariable( sysp ); | ||||
| } | } | ||||
| /** | |||||
| * Clear out the java arguments. | |||||
| */ | |||||
| public void clearJavaArgs() | |||||
| { | |||||
| javaCommand.clearArgs(); | |||||
| } | |||||
| public Argument createArgument() | public Argument createArgument() | ||||
| { | { | ||||
| return javaCommand.createArgument(); | return javaCommand.createArgument(); | ||||
| @@ -239,7 +232,8 @@ public class CommandlineJava | |||||
| { | { | ||||
| try | try | ||||
| { | { | ||||
| return Commandline.toString( getCommandline() ); | |||||
| String[] line = getCommandline(); | |||||
| return StringUtil.join( line, " " ); | |||||
| } | } | ||||
| catch( TaskException e ) | catch( TaskException e ) | ||||
| { | { | ||||
| @@ -249,7 +243,8 @@ public class CommandlineJava | |||||
| private Commandline getActualVMCommand() | private Commandline getActualVMCommand() | ||||
| { | { | ||||
| Commandline actualVMCommand = (Commandline)vmCommand.clone(); | |||||
| Commandline actualVMCommand = new Commandline(); | |||||
| //(Commandline)vmCommand.clone(); | |||||
| if( maxMemory != null ) | if( maxMemory != null ) | ||||
| { | { | ||||
| actualVMCommand.createArgument().setValue( "-Xmx" + maxMemory ); | actualVMCommand.createArgument().setValue( "-Xmx" + maxMemory ); | ||||