comparison src/share/vm/runtime/vm_version.cpp @ 1800:728a287f6c20

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 d2ede61b7a12
children f95d63e2154a
comparison
equal deleted inserted replaced
1776:8a8a7a014a12 1800:728a287f6c20
119 119
120 const char* Abstract_VM_Version::vm_vendor() { 120 const char* Abstract_VM_Version::vm_vendor() {
121 #ifdef VENDOR 121 #ifdef VENDOR
122 return XSTR(VENDOR); 122 return XSTR(VENDOR);
123 #else 123 #else
124 return "Sun Microsystems Inc."; 124 return JDK_Version::is_gte_jdk17x_version() ?
125 "Oracle Corporation" : "Sun Microsystems Inc.";
125 #endif 126 #endif
126 } 127 }
127 128
128 129
129 const char* Abstract_VM_Version::vm_info_string() { 130 const char* Abstract_VM_Version::vm_info_string() {