Mercurial > hg > truffle

comparison src/share/vm/runtime/arguments.cpp @ 1864:dfb38ea7da17

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
6988363: Rebrand vm vendor property settings (jdk7 only) Summary: Vendor properties should be initialized after JDK version is determined. Reviewed-by: kamg, ohair, dcubed, dholmes
author zgu
date Thu, 30 Sep 2010 12:05:08 -0400
parents a25394352030
children b6aedd1acdc0
comparison
equal deleted inserted replaced
1807:b2045e0af26e 1864:dfb38ea7da17
117 void Arguments::init_system_properties() { 117 void Arguments::init_system_properties() {
118 118
119 PropertyList_add(&_system_properties, new SystemProperty("java.vm.specification.version", "1.0", false)); 119 PropertyList_add(&_system_properties, new SystemProperty("java.vm.specification.version", "1.0", false));
120 PropertyList_add(&_system_properties, new SystemProperty("java.vm.specification.name", 120 PropertyList_add(&_system_properties, new SystemProperty("java.vm.specification.name",
121 "Java Virtual Machine Specification", false)); 121 "Java Virtual Machine Specification", false));
122 PropertyList_add(&_system_properties, new SystemProperty("java.vm.specification.vendor",
123 JDK_Version::is_gte_jdk17x_version() ? "Oracle Corporation" : "Sun Microsystems Inc.", false));
124 PropertyList_add(&_system_properties, new SystemProperty("java.vm.version", VM_Version::vm_release(), false)); 122 PropertyList_add(&_system_properties, new SystemProperty("java.vm.version", VM_Version::vm_release(), false));
125 PropertyList_add(&_system_properties, new SystemProperty("java.vm.name", VM_Version::vm_name(), false)); 123 PropertyList_add(&_system_properties, new SystemProperty("java.vm.name", VM_Version::vm_name(), false));
126 PropertyList_add(&_system_properties, new SystemProperty("java.vm.vendor", VM_Version::vm_vendor(), false));
127 PropertyList_add(&_system_properties, new SystemProperty("java.vm.info", VM_Version::vm_info_string(), true)); 124 PropertyList_add(&_system_properties, new SystemProperty("java.vm.info", VM_Version::vm_info_string(), true));
128 125
129 // following are JVMTI agent writeable properties. 126 // following are JVMTI agent writeable properties.
130 // Properties values are set to NULL and they are 127 // Properties values are set to NULL and they are
131 // os specific they are initialized in os::init_system_properties_values(). 128 // os specific they are initialized in os::init_system_properties_values().
147 PropertyList_add(&_system_properties, _java_class_path); 144 PropertyList_add(&_system_properties, _java_class_path);
148 PropertyList_add(&_system_properties, _sun_boot_class_path); 145 PropertyList_add(&_system_properties, _sun_boot_class_path);
149 146
150 // Set OS specific system properties values 147 // Set OS specific system properties values
151 os::init_system_properties_values(); 148 os::init_system_properties_values();
149 }
150
151
152 // Update/Initialize System properties after JDK version number is known
153 void Arguments::init_version_specific_system_properties() {
154 PropertyList_add(&_system_properties, new SystemProperty("java.vm.specification.vendor",
155 JDK_Version::is_gte_jdk17x_version() ? "Oracle Corporation" : "Sun Microsystems Inc.", false));
156 PropertyList_add(&_system_properties, new SystemProperty("java.vm.vendor", VM_Version::vm_vendor(), false));
152 } 157 }
153 158
154 /** 159 /**
155 * Provide a slightly more user-friendly way of eliminating -XX flags. 160 * Provide a slightly more user-friendly way of eliminating -XX flags.
156 * When a flag is eliminated, it can be added to this list in order to 161 * When a flag is eliminated, it can be added to this list in order to