提交 9122fdbd 编写于 作者: Z zgu

6981753: Rebrand vm vendor property settings

Summary: Uses JDK_Version to determinate to set vm vendor to "Oracle Corporation" for JDK7 and later.
Reviewed-by: kamg, ohair, coleenp
上级 69a18a35
...@@ -121,7 +121,7 @@ void Arguments::init_system_properties() { ...@@ -121,7 +121,7 @@ void Arguments::init_system_properties() {
PropertyList_add(&_system_properties, new SystemProperty("java.vm.specification.name", PropertyList_add(&_system_properties, new SystemProperty("java.vm.specification.name",
"Java Virtual Machine Specification", false)); "Java Virtual Machine Specification", false));
PropertyList_add(&_system_properties, new SystemProperty("java.vm.specification.vendor", PropertyList_add(&_system_properties, new SystemProperty("java.vm.specification.vendor",
"Sun Microsystems Inc.", false)); JDK_Version::is_gte_jdk17x_version() ? "Oracle Corporation" : "Sun Microsystems Inc.", false));
PropertyList_add(&_system_properties, new SystemProperty("java.vm.version", VM_Version::vm_release(), false)); PropertyList_add(&_system_properties, new SystemProperty("java.vm.version", VM_Version::vm_release(), false));
PropertyList_add(&_system_properties, new SystemProperty("java.vm.name", VM_Version::vm_name(), false)); PropertyList_add(&_system_properties, new SystemProperty("java.vm.name", VM_Version::vm_name(), false));
PropertyList_add(&_system_properties, new SystemProperty("java.vm.vendor", VM_Version::vm_vendor(), false)); PropertyList_add(&_system_properties, new SystemProperty("java.vm.vendor", VM_Version::vm_vendor(), false));
......
...@@ -121,7 +121,8 @@ const char* Abstract_VM_Version::vm_vendor() { ...@@ -121,7 +121,8 @@ const char* Abstract_VM_Version::vm_vendor() {
#ifdef VENDOR #ifdef VENDOR
return XSTR(VENDOR); return XSTR(VENDOR);
#else #else
return "Sun Microsystems Inc."; return JDK_Version::is_gte_jdk17x_version() ?
"Oracle Corporation" : "Sun Microsystems Inc.";
#endif #endif
} }
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册