# HG changeset patch
# User kvn
# Date 1360691674 28800
# Node ID 6c2da81297c5912c6932f94f7777517c3f8227f9
# Parent  9e2da96f997668e3218a35191c5e764848c3b541# Parent  1e5e28bac299b795ff9420058fe1b8b0b78b9675
Merge

diff -r 1e5e28bac299 -r 6c2da81297c5 src/share/vm/runtime/arguments.cpp
--- a/src/share/vm/runtime/arguments.cpp	Mon Feb 11 14:47:04 2013 -0800
+++ b/src/share/vm/runtime/arguments.cpp	Tue Feb 12 09:54:34 2013 -0800
@@ -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) {