archive/jdk
1
0
Fork 0
mirror of https://github.com/openjdk/jdk.git synced 2025-08-28 15:24:43 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

8214498: java/util/Locale/bcp47u/SystemPropertyTests.java wrong locale default

Browse source 
Reviewed-by: lancea, bpb
This commit is contained in:
Roger Riggs 2018-12-06 09:55:02 -05:00
parent 145582dfa1
commit 2e724a371a
1 changed files with 9 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

16
src/java.base/share/classes/jdk/internal/util/SystemProps.java
View file

@ -152,16 +152,18 @@ public final class SystemProps {
String format) { String format) {
// Do not override command line setting // Do not override command line setting
String baseValue = cmdProps.getProperty(base); String baseValue = cmdProps.getProperty(base);
if (baseValue == null) {
// Not overridden on the command line; define the properties if there are platform defined values
baseValue = display;
}
if (baseValue != null) { if (baseValue != null) {
cmdProps.put(base, baseValue); return; // Do not override value from the command line
}
// Not overridden on the command line; define the properties if there are platform defined values
if (display != null) {
cmdProps.put(base, display);
baseValue = display;
} }
/* user.xxx.display property */ /* user.xxx.display property */
String disp = base + ".display"; String disp = base.concat(".display");
String dispValue = cmdProps.getProperty(disp); String dispValue = cmdProps.getProperty(disp);
if (dispValue == null && display != null && !display.equals(baseValue)) { if (dispValue == null && display != null && !display.equals(baseValue)) {
// Create the property only if different from the base property // Create the property only if different from the base property
@ -169,7 +171,7 @@ public final class SystemProps {
} }
/* user.xxx.format property */ /* user.xxx.format property */
String fmt = base + ".format"; String fmt = base.concat(".format");
String fmtValue = cmdProps.getProperty(fmt); String fmtValue = cmdProps.getProperty(fmt);
if (fmtValue == null && format != null && !format.equals(baseValue)) { if (fmtValue == null && format != null && !format.equals(baseValue)) {
// Create the property only if different than the base property // Create the property only if different than the base property