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

8263090: Avoid reading volatile fields twice in Locale.getDefault(Category)

Browse source 
Reviewed-by: rriggs, naoto, serb
This commit is contained in:
Claes Redestad 2021-03-08 10:32:55 +00:00
parent 61cff4da90
commit 13625bebd0
2 changed files with 87 additions and 20 deletions
Download patch file Download diff file Expand all files Collapse all files

49
src/java.base/share/classes/java/util/Locale.java
View file

@ -939,29 +939,38 @@ public final class Locale implements Cloneable, Serializable {
*/
public static Locale getDefault(Locale.Category category) {
// do not synchronize this method - see 4071298
switch (category) {
case DISPLAY:
if (defaultDisplayLocale == null) {
synchronized(Locale.class) {
if (defaultDisplayLocale == null) {
defaultDisplayLocale = initDefault(category);
}
}
Objects.requireNonNull(category);
if (category == Category.DISPLAY) {
Locale loc = defaultDisplayLocale; // volatile read
if (loc == null) {
loc = getDisplayLocale();
}
return defaultDisplayLocale;
case FORMAT:
if (defaultFormatLocale == null) {
synchronized(Locale.class) {
if (defaultFormatLocale == null) {
defaultFormatLocale = initDefault(category);
}
}
return loc;
} else {
assert category == Category.FORMAT : "Unknown category";
Locale loc = defaultFormatLocale; // volatile read
if (loc == null) {
loc = getFormatLocale();
}
return defaultFormatLocale;
default:
assert false: "Unknown Category";
return loc;
}
return getDefault();
}
private static synchronized Locale getDisplayLocale() {
Locale loc = defaultDisplayLocale;
if (loc == null) {
loc = defaultDisplayLocale = initDefault(Category.DISPLAY);
}
return loc;
}
private static synchronized Locale getFormatLocale() {
Locale loc = defaultFormatLocale;
if (loc == null) {
loc = defaultFormatLocale = initDefault(Category.FORMAT);
}
return loc;
}
private static Locale initDefault() {