Skip to content
Snippets Groups Projects
Commit c0e2c6e3 authored by Tomasz Grabiec's avatar Tomasz Grabiec
Browse files

java: move -version handling to RunJava

It does not belong in the isolate API but to the
command line java starter.
parent e8e3f3a3
No related branches found
No related tags found
No related merge requests found
...@@ -128,16 +128,6 @@ public class ContextIsolator { ...@@ -128,16 +128,6 @@ public class ContextIsolator {
String key = args[i].substring(2, eq); String key = args[i].substring(2, eq);
String value = args[i].substring(eq + 1, args[i].length()); String value = args[i].substring(eq + 1, args[i].length());
System.setProperty(key, value); System.setProperty(key, value);
} else if (args[i].equals("-version")) {
System.err.println("java version \"" +
System.getProperty("java.version") + "\"");
System.err.println(System.getProperty("java.runtime.name") +
" (" + System.getProperty("java.runtime.version") +
")");
System.err.println(System.getProperty("java.vm.name") +
" (build " + System.getProperty("java.vm.version") +
", " + System.getProperty("java.vm.info") + ")");
return null;
} else if (args[i].equals("-Xclassloader")) { } else if (args[i].equals("-Xclassloader")) {
// Non-standard try - use a different class loader. // Non-standard try - use a different class loader.
if (i + 1 >= args.length) { if (i + 1 >= args.length) {
......
...@@ -10,6 +10,18 @@ package io.osv; ...@@ -10,6 +10,18 @@ package io.osv;
public class RunJava { public class RunJava {
public static void main(String[] args) { public static void main(String[] args) {
if (args[0].equals("-version")) {
System.err.println("java version \"" +
System.getProperty("java.version") + "\"");
System.err.println(System.getProperty("java.runtime.name") +
" (" + System.getProperty("java.runtime.version") +
")");
System.err.println(System.getProperty("java.vm.name") +
" (build " + System.getProperty("java.vm.version") +
", " + System.getProperty("java.vm.info") + ")");
return;
}
try { try {
ContextIsolator.getInstance().runSync(args); ContextIsolator.getInstance().runSync(args);
} catch (Throwable ex) { } catch (Throwable ex) {
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment