comparison src/share/vm/runtime/arguments.cpp @ 8082:9e2da96f9976

Merge
author bpittore
date Fri, 08 Feb 2013 16:08:17 -0500
parents 3c9bc17b9403 579f6adb7f51
children 6c2da81297c5
comparison
equal deleted inserted replaced
8020:1a0174612b49 8082:9e2da96f9976
2478 if (!add_property(tail)) { 2478 if (!add_property(tail)) {
2479 return JNI_ENOMEM; 2479 return JNI_ENOMEM;
2480 } 2480 }
2481 // Out of the box management support 2481 // Out of the box management support
2482 if (match_option(option, "-Dcom.sun.management", &tail)) { 2482 if (match_option(option, "-Dcom.sun.management", &tail)) {
2483 #if INCLUDE_MANAGEMENT
2483 FLAG_SET_CMDLINE(bool, ManagementServer, true); 2484 FLAG_SET_CMDLINE(bool, ManagementServer, true);
2485 #else
2486 vm_exit_during_initialization(
2487 "-Dcom.sun.management is not supported in this VM.", NULL);
2488 #endif
2484 } 2489 }
2485 // -Xint 2490 // -Xint
2486 } else if (match_option(option, "-Xint", &tail)) { 2491 } else if (match_option(option, "-Xint", &tail)) {
2487 set_mode_flags(_int); 2492 set_mode_flags(_int);
2488 // -Xmixed 2493 // -Xmixed
2824 } else if (match_option(option, "-XX:+UseVMInterruptibleIO", &tail)) { 2829 } else if (match_option(option, "-XX:+UseVMInterruptibleIO", &tail)) {
2825 // NOTE! In JDK 9, the UseVMInterruptibleIO flag will completely go 2830 // NOTE! In JDK 9, the UseVMInterruptibleIO flag will completely go
2826 // away and will cause VM initialization failures! 2831 // away and will cause VM initialization failures!
2827 warning("-XX:+UseVMInterruptibleIO is obsolete and will be removed in a future release."); 2832 warning("-XX:+UseVMInterruptibleIO is obsolete and will be removed in a future release.");
2828 FLAG_SET_CMDLINE(bool, UseVMInterruptibleIO, true); 2833 FLAG_SET_CMDLINE(bool, UseVMInterruptibleIO, true);
2834 #if !INCLUDE_MANAGEMENT
2835 } else if (match_option(option, "-XX:+ManagementServer", &tail)) {
2836 vm_exit_during_initialization(
2837 "ManagementServer is not supported in this VM.", NULL);
2838 #endif // INCLUDE_MANAGEMENT
2829 } else if (match_option(option, "-XX:", &tail)) { // -XX:xxxx 2839 } else if (match_option(option, "-XX:", &tail)) { // -XX:xxxx
2830 // Skip -XX:Flags= since that case has already been handled 2840 // Skip -XX:Flags= since that case has already been handled
2831 if (strncmp(tail, "Flags=", strlen("Flags=")) != 0) { 2841 if (strncmp(tail, "Flags=", strlen("Flags=")) != 0) {
2832 if (!process_argument(tail, args->ignoreUnrecognized, origin)) { 2842 if (!process_argument(tail, args->ignoreUnrecognized, origin)) {
2833 return JNI_EINVAL; 2843 return JNI_EINVAL;