--- a/hotspot/src/share/vm/runtime/arguments.cpp Wed Oct 15 05:55:44 2014 -0700
+++ b/hotspot/src/share/vm/runtime/arguments.cpp Thu Oct 16 14:11:53 2014 -0400
@@ -3739,27 +3739,33 @@
bool settings_file_specified = false;
bool needs_hotspotrc_warning = false;
- ArgumentsExt::process_options(args);
-
const char* flags_file;
int index;
for (index = 0; index < args->nOptions; index++) {
const JavaVMOption *option = args->options + index;
+ if (ArgumentsExt::process_options(option)) {
+ continue;
+ }
if (match_option(option, "-XX:Flags=", &tail)) {
flags_file = tail;
settings_file_specified = true;
+ continue;
}
if (match_option(option, "-XX:+PrintVMOptions", &tail)) {
PrintVMOptions = true;
+ continue;
}
if (match_option(option, "-XX:-PrintVMOptions", &tail)) {
PrintVMOptions = false;
+ continue;
}
if (match_option(option, "-XX:+IgnoreUnrecognizedVMOptions", &tail)) {
IgnoreUnrecognizedVMOptions = true;
+ continue;
}
if (match_option(option, "-XX:-IgnoreUnrecognizedVMOptions", &tail)) {
IgnoreUnrecognizedVMOptions = false;
+ continue;
}
if (match_option(option, "-XX:+PrintFlagsInitial", &tail)) {
CommandLineFlags::printFlags(tty, false);
@@ -3781,6 +3787,7 @@
} else {
vm_exit_during_initialization("Syntax error, expecting -XX:NativeMemoryTracking=[off|summary|detail]", NULL);
}
+ continue;
}
#endif