1.1 --- a/src/share/vm/runtime/arguments.cpp Fri Sep 24 00:52:04 2010 -0700
1.2 +++ b/src/share/vm/runtime/arguments.cpp Thu Sep 30 12:05:08 2010 -0400
1.3 @@ -119,11 +119,8 @@
1.4 PropertyList_add(&_system_properties, new SystemProperty("java.vm.specification.version", "1.0", false));
1.5 PropertyList_add(&_system_properties, new SystemProperty("java.vm.specification.name",
1.6 "Java Virtual Machine Specification", false));
1.7 - PropertyList_add(&_system_properties, new SystemProperty("java.vm.specification.vendor",
1.8 - JDK_Version::is_gte_jdk17x_version() ? "Oracle Corporation" : "Sun Microsystems Inc.", false));
1.9 PropertyList_add(&_system_properties, new SystemProperty("java.vm.version", VM_Version::vm_release(), false));
1.10 PropertyList_add(&_system_properties, new SystemProperty("java.vm.name", VM_Version::vm_name(), false));
1.11 - PropertyList_add(&_system_properties, new SystemProperty("java.vm.vendor", VM_Version::vm_vendor(), false));
1.12 PropertyList_add(&_system_properties, new SystemProperty("java.vm.info", VM_Version::vm_info_string(), true));
1.13
1.14 // following are JVMTI agent writeable properties.
1.15 @@ -151,6 +148,14 @@
1.16 os::init_system_properties_values();
1.17 }
1.18
1.19 +
1.20 + // Update/Initialize System properties after JDK version number is known
1.21 +void Arguments::init_version_specific_system_properties() {
1.22 + PropertyList_add(&_system_properties, new SystemProperty("java.vm.specification.vendor",
1.23 + JDK_Version::is_gte_jdk17x_version() ? "Oracle Corporation" : "Sun Microsystems Inc.", false));
1.24 + PropertyList_add(&_system_properties, new SystemProperty("java.vm.vendor", VM_Version::vm_vendor(), false));
1.25 +}
1.26 +
1.27 /**
1.28 * Provide a slightly more user-friendly way of eliminating -XX flags.
1.29 * When a flag is eliminated, it can be added to this list in order to
