Merge

Fri, 17 Sep 2010 09:14:26 -0700

author
zgu
date
Fri, 17 Sep 2010 09:14:26 -0700
changeset 2156
51640ecd89f8
parent 2154
4094f07967ca
parent 2155
728a287f6c20
child 2157
3babdb042f25

Merge

     1.1 --- a/src/share/vm/runtime/arguments.cpp	Wed Sep 15 16:28:19 2010 -0400
     1.2 +++ b/src/share/vm/runtime/arguments.cpp	Fri Sep 17 09:14:26 2010 -0700
     1.3 @@ -121,7 +121,7 @@
     1.4    PropertyList_add(&_system_properties, new SystemProperty("java.vm.specification.name",
     1.5                                                                   "Java Virtual Machine Specification",  false));
     1.6    PropertyList_add(&_system_properties, new SystemProperty("java.vm.specification.vendor",
     1.7 -                                                                 "Sun Microsystems Inc.",  false));
     1.8 +        JDK_Version::is_gte_jdk17x_version() ? "Oracle Corporation" : "Sun Microsystems Inc.", false));
     1.9    PropertyList_add(&_system_properties, new SystemProperty("java.vm.version", VM_Version::vm_release(),  false));
    1.10    PropertyList_add(&_system_properties, new SystemProperty("java.vm.name", VM_Version::vm_name(),  false));
    1.11    PropertyList_add(&_system_properties, new SystemProperty("java.vm.vendor", VM_Version::vm_vendor(),  false));
     2.1 --- a/src/share/vm/runtime/vm_version.cpp	Wed Sep 15 16:28:19 2010 -0400
     2.2 +++ b/src/share/vm/runtime/vm_version.cpp	Fri Sep 17 09:14:26 2010 -0700
     2.3 @@ -121,7 +121,8 @@
     2.4  #ifdef VENDOR
     2.5    return XSTR(VENDOR);
     2.6  #else
     2.7 -  return "Sun Microsystems Inc.";
     2.8 +  return JDK_Version::is_gte_jdk17x_version() ?
     2.9 +    "Oracle Corporation" : "Sun Microsystems Inc.";
    2.10  #endif
    2.11  }
    2.12  

mercurial