# HG changeset patch
# User zgu
# Date 1284740066 25200
# Node ID 51640ecd89f8e38bf0c89873190148fafa9345ee
# Parent  4094f07967ca4790b00a7a62514b2d0b737c3fd9# Parent  728a287f6c20ea7dc5d32f0fa0a419dce2dab4be
Merge

diff -r 4094f07967ca -r 51640ecd89f8 src/share/vm/runtime/arguments.cpp
--- a/src/share/vm/runtime/arguments.cpp	Wed Sep 15 16:28:19 2010 -0400
+++ b/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));
diff -r 4094f07967ca -r 51640ecd89f8 src/share/vm/runtime/vm_version.cpp
--- a/src/share/vm/runtime/vm_version.cpp	Wed Sep 15 16:28:19 2010 -0400
+++ b/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
 }