OpenE2K/gcc
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

ResourceBundle.java (resourceBundleCache): Not final.

Browse Source 
* java/util/ResourceBundle.java (resourceBundleCache): Not final.
	(lastDefaultLocale): New field.
	(getBundle): When Locale.getDefault != lastDefaultLocale reset
	resourceBundleCache.

From-SVN: r59948
This commit is contained in:
Mark Wielaard 2002-12-08 23:38:02 +00:00 committed by Mark Wielaard
parent 37c66aa6ef
commit 24632117ce
2 changed files with 22 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
libjava/ChangeLog
View File

@ -1,3 +1,10 @@
2002-12-08 Mark Wielaard <mark@klomp.org>
* java/util/ResourceBundle.java (resourceBundleCache): Not final.
(lastDefaultLocale): New field.
(getBundle): When Locale.getDefault != lastDefaultLocale reset
resourceBundleCache.
2002-12-06 Mark Wielaard <mark@klomp.org>
* java/net/InetAddress.java (toString): Use hostname when not null,

18
libjava/java/util/ResourceBundle.java
View File

@ -111,7 +111,13 @@ public abstract class ResourceBundle
* second hash map is the localized name, the value is a soft
* references to the resource bundle.
*/
private static final Map resourceBundleCache = new HashMap();
private static Map resourceBundleCache;
/**
* The last default Locale we saw. If this ever changes then we have to
* reset our caches.
*/
private static Locale lastDefaultLocale;
/**
* The `empty' locale is created once in order to optimize
@ -312,6 +318,12 @@ public abstract class ResourceBundle
{
// This implementation searches the bundle in the reverse direction
// and builds the parent chain on the fly.
Locale defaultLocale = Locale.getDefault();
if (defaultLocale != lastDefaultLocale)
{
resourceBundleCache = new HashMap();
lastDefaultLocale = defaultLocale;
}
HashMap cache = (HashMap) resourceBundleCache.get(classLoader);
StringBuffer sb = new StringBuffer(60);
sb.append(baseName).append('_').append(locale);
@ -359,9 +371,9 @@ public abstract class ResourceBundle
// bundle.
ResourceBundle bundle = tryLocalBundle(baseName, locale,
classLoader, baseBundle, cache);
if (bundle == baseBundle && !locale.equals(Locale.getDefault()))
if (bundle == baseBundle && !locale.equals(defaultLocale))
{
bundle = tryLocalBundle(baseName, Locale.getDefault(),
bundle = tryLocalBundle(baseName, defaultLocale,
classLoader, baseBundle, cache);
// We need to record that the argument locale maps to the
// bundle we just found. If we didn't find a bundle, record