OpenJDK / graal / graal-jvmci-8
changeset 8082:9e2da96f9976
Merge
| author | bpittore |
|---|---|
| date | Fri, 08 Feb 2013 16:08:17 -0500 |
| parents | 1a0174612b49 579f6adb7f51 |
| children | 6c2da81297c5 |
| files | src/share/vm/runtime/arguments.cpp |
| diffstat | 1 files changed, 10 insertions(+), 0 deletions(-) [+] |
line wrap: on
line diff
--- a/src/share/vm/runtime/arguments.cpp Fri Feb 08 08:16:00 2013 -0800 +++ b/src/share/vm/runtime/arguments.cpp Fri Feb 08 16:08:17 2013 -0500 @@ -2480,7 +2480,12 @@ } // Out of the box management support if (match_option(option, "-Dcom.sun.management", &tail)) { +#if INCLUDE_MANAGEMENT FLAG_SET_CMDLINE(bool, ManagementServer, true); +#else + vm_exit_during_initialization( + "-Dcom.sun.management is not supported in this VM.", NULL); +#endif } // -Xint } else if (match_option(option, "-Xint", &tail)) { @@ -2826,6 +2831,11 @@ // away and will cause VM initialization failures! warning("-XX:+UseVMInterruptibleIO is obsolete and will be removed in a future release."); FLAG_SET_CMDLINE(bool, UseVMInterruptibleIO, true); +#if !INCLUDE_MANAGEMENT + } else if (match_option(option, "-XX:+ManagementServer", &tail)) { + vm_exit_during_initialization( + "ManagementServer is not supported in this VM.", NULL); +#endif // INCLUDE_MANAGEMENT } else if (match_option(option, "-XX:", &tail)) { // -XX:xxxx // Skip -XX:Flags= since that case has already been handled if (strncmp(tail, "Flags=", strlen("Flags=")) != 0) {