1berry/openjdk
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

6981753: Rebrand vm vendor property settings

Browse Source 
Uses JDK_Version to determinate to set vm vendor to "Oracle Corporation" for JDK7 and later.

Reviewed-by: kamg, ohair, coleenp
This commit is contained in:
Zhengyu Gu 2010-09-17 09:45:32 -04:00
parent b9760f8836
commit f9eb9cccb9
2 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
hotspot/src/share/vm/runtime/arguments.cpp
View File

@ -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));

3
hotspot/src/share/vm/runtime/vm_version.cpp
View File

@ -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
} }