OpenJDK / jdk / jdk
changeset 6470:829a79f301ad
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
| author | zgu |
|---|---|
| date | Fri, 17 Sep 2010 09:45:32 -0400 |
| parents | 23c019f5aef4 |
| children | 7d8425d8d18a |
| files | hotspot/src/share/vm/runtime/arguments.cpp hotspot/src/share/vm/runtime/vm_version.cpp |
| diffstat | 2 files changed, 3 insertions(+), 2 deletions(-) [+] |
line wrap: on
line diff
--- a/hotspot/src/share/vm/runtime/arguments.cpp Mon Sep 13 07:38:10 2010 -0700 +++ b/hotspot/src/share/vm/runtime/arguments.cpp Fri Sep 17 09:45:32 2010 -0400 @@ -121,7 +121,7 @@ PropertyList_add(&_system_properties, new SystemProperty("java.vm.specification.name", "Java Virtual Machine Specification", false)); 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.name", VM_Version::vm_name(), false)); PropertyList_add(&_system_properties, new SystemProperty("java.vm.vendor", VM_Version::vm_vendor(), false));
--- a/hotspot/src/share/vm/runtime/vm_version.cpp Mon Sep 13 07:38:10 2010 -0700 +++ b/hotspot/src/share/vm/runtime/vm_version.cpp Fri Sep 17 09:45:32 2010 -0400 @@ -121,7 +121,8 @@ #ifdef VENDOR return XSTR(VENDOR); #else - return "Sun Microsystems Inc."; + return JDK_Version::is_gte_jdk17x_version() ? + "Oracle Corporation" : "Sun Microsystems Inc."; #endif }