# HG changeset patch
# User jprovino
# Date 1360089154 18000
# Node ID 579f6adb7f51b859428c3692b889de32d0f16edc
# Parent  8391fdd36e1f1d89ecfb9129a554efc3e741dd85
8003539: Minimal VM don't react to -Dcom.sun.management and -XX:+ManagementServer
Summary: A warning message should be displayed if these options are used with the Minimal VM.
Reviewed-by: dholmes, dsamersoff

diff -r 8391fdd36e1f -r 579f6adb7f51 src/share/vm/runtime/arguments.cpp
--- a/src/share/vm/runtime/arguments.cpp	Sun Jan 27 01:07:09 2013 -0800
+++ b/src/share/vm/runtime/arguments.cpp	Tue Feb 05 13:32:34 2013 -0500
@@ -2458,7 +2458,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)) {
@@ -2807,6 +2812,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) {