changeset 6471:7d8425d8d18a

Merge
author zgu
date Fri, 17 Sep 2010 09:14:26 -0700
parents d32518d9eba5 829a79f301ad
children 0e9400386b16
files
diffstat 2 files changed, 3 insertions(+), 2 deletions(-) [+]
line wrap: on
line diff
--- a/hotspot/src/share/vm/runtime/arguments.cpp	Wed Sep 15 16:28:19 2010 -0400
+++ b/hotspot/src/share/vm/runtime/arguments.cpp	Fri Sep 17 09:14:26 2010 -0700
@@ -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	Wed Sep 15 16:28:19 2010 -0400
+++ b/hotspot/src/share/vm/runtime/vm_version.cpp	Fri Sep 17 09:14:26 2010 -0700
@@ -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
 }