stan/jdk-24
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

4808233: "Locale" not thread-safe

Browse Source 
Reviewed-by: okutsu
This commit is contained in:
Naoto Sato 2011-12-13 15:41:47 -08:00
parent f5bfcb05b2
commit f31e66f99c
1 changed files with 18 additions and 28 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

46
jdk/src/share/classes/java/util/Locale.java
View File

@ -737,10 +737,6 @@ public final class Locale implements Cloneable, Serializable {
*/ */
public static Locale getDefault() { public static Locale getDefault() {
// do not synchronize this method - see 4071298 // do not synchronize this method - see 4071298
// it's OK if more than one default locale happens to be created
if (defaultLocale == null) {
initDefault();
}
return defaultLocale; return defaultLocale;
} }
@ -762,16 +758,23 @@ public final class Locale implements Cloneable, Serializable {
*/ */
public static Locale getDefault(Locale.Category category) { public static Locale getDefault(Locale.Category category) {
// do not synchronize this method - see 4071298 // do not synchronize this method - see 4071298
// it's OK if more than one default locale happens to be created
switch (category) { switch (category) {
case DISPLAY: case DISPLAY:
if (defaultDisplayLocale == null) { if (defaultDisplayLocale == null) {
initDefault(category); synchronized(Locale.class) {
if (defaultDisplayLocale == null) {
defaultDisplayLocale = initDefault(category);
}
}
} }
return defaultDisplayLocale; return defaultDisplayLocale;
case FORMAT: case FORMAT:
if (defaultFormatLocale == null) { if (defaultFormatLocale == null) {
initDefault(category); synchronized(Locale.class) {
if (defaultFormatLocale == null) {
defaultFormatLocale = initDefault(category);
}
}
} }
return defaultFormatLocale; return defaultFormatLocale;
default: default:
@ -780,7 +783,7 @@ public final class Locale implements Cloneable, Serializable {
return getDefault(); return getDefault();
} }
private static void initDefault() { private static Locale initDefault() {
String language, region, script, country, variant; String language, region, script, country, variant;
language = AccessController.doPrivileged( language = AccessController.doPrivileged(
new GetPropertyAction("user.language", "en")); new GetPropertyAction("user.language", "en"));
@ -806,16 +809,12 @@ public final class Locale implements Cloneable, Serializable {
variant = AccessController.doPrivileged( variant = AccessController.doPrivileged(
new GetPropertyAction("user.variant", "")); new GetPropertyAction("user.variant", ""));
} }
defaultLocale = getInstance(language, script, country, variant, null);
return getInstance(language, script, country, variant, null);
} }
private static void initDefault(Locale.Category category) { private static Locale initDefault(Locale.Category category) {
// make sure defaultLocale is initialized return getInstance(
if (defaultLocale == null) {
initDefault();
}
Locale defaultCategoryLocale = getInstance(
AccessController.doPrivileged( AccessController.doPrivileged(
new GetPropertyAction(category.languageKey, defaultLocale.getLanguage())), new GetPropertyAction(category.languageKey, defaultLocale.getLanguage())),
AccessController.doPrivileged( AccessController.doPrivileged(
@ -825,15 +824,6 @@ public final class Locale implements Cloneable, Serializable {
AccessController.doPrivileged( AccessController.doPrivileged(
new GetPropertyAction(category.variantKey, defaultLocale.getVariant())), new GetPropertyAction(category.variantKey, defaultLocale.getVariant())),
null); null);
switch (category) {
case DISPLAY:
defaultDisplayLocale = defaultCategoryLocale;
break;
case FORMAT:
defaultFormatLocale = defaultCategoryLocale;
break;
}
} }
/** /**
@ -1916,9 +1906,9 @@ public final class Locale implements Cloneable, Serializable {
*/ */
private transient volatile int hashCodeValue = 0; private transient volatile int hashCodeValue = 0;
private static Locale defaultLocale = null; private volatile static Locale defaultLocale = initDefault();
private static Locale defaultDisplayLocale = null; private volatile static Locale defaultDisplayLocale = null;
private static Locale defaultFormatLocale = null; private volatile static Locale defaultFormatLocale = null;
/** /**
* Return an array of the display names of the variant. * Return an array of the display names of the variant.