Skip to content

Fix ant fork=true NPE by parsing java command line #603

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
LSantha wants to merge 1 commit into from
Closed

Fix ant fork=true NPE by parsing java command line #603

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
27 changes: 27 additions & 0 deletions core/src/classpath/vm/java/lang/VMRuntime.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -223,6 +223,33 @@ static Process exec(String[] cmd, String[] env, File dir)
String mainClassName = cmd[0];
String[] cmdArgs = new String[cmd.length - 1];
System.arraycopy(cmd, 1, cmdArgs, 0, cmdArgs.length);

if ("java".equals(mainClassName)) {
String parsedClassName = null;
String[] parsedArgs = null;
int classpathEnd = 0;

for (int i = 0; i < cmdArgs.length; i++) {
if ("-cp".equals(cmdArgs[i]) || "-classpath".equals(cmdArgs[i])) {
if (i + 1 < cmdArgs.length) {
i++;
}
classpathEnd = i + 1;
} else if (!cmdArgs[i].startsWith("-")) {
parsedClassName = cmdArgs[i];
int argsCount = cmdArgs.length - i - 1;
parsedArgs = new String[argsCount];
System.arraycopy(cmdArgs, i + 1, parsedArgs, 0, argsCount);
break;
}
}

if (parsedClassName != null) {
mainClassName = parsedClassName;
cmdArgs = parsedArgs != null ? parsedArgs : new String[0];
}
}

try {
final Process p =
VmProcess.createProcess(mainClassName, cmdArgs, env);
Expand Down
Loading