AuroraMiddleware/scuffed-code
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

ICU-7434 UResourceBundle ROOT_CACHE direct reference not SoftReference, change RootType from int to enum, remove hacky & obsolete resetBundleCache()

Browse Source 
X-SVN-Rev: 38747
This commit is contained in:
Markus Scherer 2016-05-16 22:37:52 +00:00
parent 54b8f0c928
commit 0c24a0abdf
2 changed files with 23 additions and 77 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

96
icu4j/main/classes/core/src/com/ibm/icu/util/UResourceBundle.java
View File

@ -7,12 +7,12 @@
package com.ibm.icu.util; package com.ibm.icu.util;
import java.lang.ref.SoftReference;
import java.nio.ByteBuffer; import java.nio.ByteBuffer;
import java.util.Collections; import java.util.Collections;
import java.util.Enumeration; import java.util.Enumeration;
import java.util.HashMap; import java.util.HashMap;
import java.util.Locale; import java.util.Locale;
import java.util.Map;
import java.util.MissingResourceException; import java.util.MissingResourceException;
import java.util.ResourceBundle; import java.util.ResourceBundle;
import java.util.Set; import java.util.Set;
@ -321,26 +321,6 @@ public abstract class UResourceBundle extends ResourceBundle {
private static ICUCache<ResourceCacheKey, UResourceBundle> BUNDLE_CACHE = private static ICUCache<ResourceCacheKey, UResourceBundle> BUNDLE_CACHE =
new SimpleCache<ResourceCacheKey, UResourceBundle>(); new SimpleCache<ResourceCacheKey, UResourceBundle>();
/**
* @internal
* @deprecated This API is ICU internal only.
*/
@Deprecated
public static void resetBundleCache() {
/*
* A HACK!!!!!
* Currently if a resourcebundle with fallback turned ON is added to the cache
* and then a getBundleInstance() is called for a bundle with fallback turned OFF
* it will actually search the cache for any bundle of the same locale
* regaurdless of fallback status. This method has been created so that if
* The calling method KNOWS that instances of the other fallback state may be in the
* cache, the calling method may call this method to clear out the cache.
*
*/
//TODO figure a way around this method(see method comment)
BUNDLE_CACHE = new SimpleCache<ResourceCacheKey, UResourceBundle>();
}
/** /**
* Method used by subclasses to add a resource bundle object to the managed * Method used by subclasses to add a resource bundle object to the managed
* cache. Works like a putIfAbsent(): If the cache already contains a matching * cache. Works like a putIfAbsent(): If the cache already contains a matching
@ -376,10 +356,10 @@ public abstract class UResourceBundle extends ResourceBundle {
/** /**
* Key used for cached resource bundles. The key checks * Key used for cached resource bundles. The key checks
* the resource name, the class root, and the default * the resource name and the default
* locale to determine if the resource is a match to the * locale to determine if the resource is a match to the
* requested one. The root may be null, but the * requested one. The default locale may be null, but the
* searchName and the default locale must have a non-null value. * searchName must have a non-null value.
* Note that the default locale may change over time, and * Note that the default locale may change over time, and
* lookup should always be based on the current default * lookup should always be based on the current default
* locale (if at all). * locale (if at all).
@ -453,68 +433,36 @@ public abstract class UResourceBundle extends ResourceBundle {
private static final ResourceCacheKey cacheKey = new ResourceCacheKey(); private static final ResourceCacheKey cacheKey = new ResourceCacheKey();
private static final int ROOT_MISSING = 0; private enum RootType { MISSING, ICU, JAVA }
private static final int ROOT_ICU = 1;
private static final int ROOT_JAVA = 2;
private static SoftReference<ConcurrentHashMap<String, Integer>> ROOT_CACHE = private static Map<String, RootType> ROOT_CACHE = new ConcurrentHashMap<String, RootType>();
new SoftReference<ConcurrentHashMap<String, Integer>>(new ConcurrentHashMap<String, Integer>());
private static int getRootType(String baseName, ClassLoader root) { private static RootType getRootType(String baseName, ClassLoader root) {
ConcurrentHashMap<String, Integer> m = null; RootType rootType = ROOT_CACHE.get(baseName);
Integer rootType;
m = ROOT_CACHE.get();
if (m == null) {
synchronized(UResourceBundle.class) {
m = ROOT_CACHE.get();
if (m == null) {
m = new ConcurrentHashMap<String, Integer>();
ROOT_CACHE = new SoftReference<ConcurrentHashMap<String, Integer>>(m);
}
}
}
rootType = m.get(baseName);
if (rootType == null) { if (rootType == null) {
String rootLocale = (baseName.indexOf('.')==-1) ? "root" : ""; String rootLocale = (baseName.indexOf('.')==-1) ? "root" : "";
int rt = ROOT_MISSING; // value set on success
try{ try{
ICUResourceBundle.getBundleInstance(baseName, rootLocale, root, true); ICUResourceBundle.getBundleInstance(baseName, rootLocale, root, true);
rt = ROOT_ICU; rootType = RootType.ICU;
}catch(MissingResourceException ex){ }catch(MissingResourceException ex){
try{ try{
ResourceBundleWrapper.getBundleInstance(baseName, rootLocale, root, true); ResourceBundleWrapper.getBundleInstance(baseName, rootLocale, root, true);
rt = ROOT_JAVA; rootType = RootType.JAVA;
}catch(MissingResourceException e){ }catch(MissingResourceException e){
//throw away the exception //throw away the exception
rootType = RootType.MISSING;
} }
} }
rootType = Integer.valueOf(rt); ROOT_CACHE.put(baseName, rootType);
m.putIfAbsent(baseName, rootType);
} }
return rootType.intValue(); return rootType;
} }
private static void setRootType(String baseName, int rootType) { private static void setRootType(String baseName, RootType rootType) {
Integer rt = Integer.valueOf(rootType); ROOT_CACHE.put(baseName, rootType);
ConcurrentHashMap<String, Integer> m = null;
m = ROOT_CACHE.get();
if (m == null) {
synchronized(UResourceBundle.class) {
m = ROOT_CACHE.get();
if (m == null) {
m = new ConcurrentHashMap<String, Integer>();
ROOT_CACHE = new SoftReference<ConcurrentHashMap<String, Integer>>(m);
}
}
}
m.put(baseName, rt);
} }
/** /**
@ -532,13 +480,12 @@ public abstract class UResourceBundle extends ResourceBundle {
protected static UResourceBundle instantiateBundle(String baseName, String localeName, protected static UResourceBundle instantiateBundle(String baseName, String localeName,
ClassLoader root, boolean disableFallback) { ClassLoader root, boolean disableFallback) {
UResourceBundle b = null; UResourceBundle b = null;
int rootType = getRootType(baseName, root); RootType rootType = getRootType(baseName, root);
ULocale defaultLocale = ULocale.getDefault(); ULocale defaultLocale = ULocale.getDefault();
switch (rootType) switch (rootType) {
{ case ICU:
case ROOT_ICU:
if(disableFallback) { if(disableFallback) {
String fullName = ICUResourceBundleReader.getFullName(baseName, localeName); String fullName = ICUResourceBundleReader.getFullName(baseName, localeName);
b = loadFromCache(fullName, defaultLocale); b = loadFromCache(fullName, defaultLocale);
@ -553,19 +500,20 @@ public abstract class UResourceBundle extends ResourceBundle {
return b; return b;
case ROOT_JAVA: case JAVA:
return ResourceBundleWrapper.getBundleInstance(baseName, localeName, root, return ResourceBundleWrapper.getBundleInstance(baseName, localeName, root,
disableFallback); disableFallback);
case MISSING:
default: default:
try{ try{
b = ICUResourceBundle.getBundleInstance(baseName, localeName, root, b = ICUResourceBundle.getBundleInstance(baseName, localeName, root,
disableFallback); disableFallback);
setRootType(baseName, ROOT_ICU); setRootType(baseName, RootType.ICU);
}catch(MissingResourceException ex){ }catch(MissingResourceException ex){
b = ResourceBundleWrapper.getBundleInstance(baseName, localeName, root, b = ResourceBundleWrapper.getBundleInstance(baseName, localeName, root,
disableFallback); disableFallback);
setRootType(baseName, ROOT_JAVA); setRootType(baseName, RootType.JAVA);
} }
return b; return b;
} }

4
icu4j/main/tests/core/src/com/ibm/icu/dev/test/util/ICUResourceBundleTest.java
View File

@ -1100,9 +1100,7 @@ public final class ICUResourceBundleTest extends TestFmwk {
} }
rb7 = UResourceBundle.getBundleInstance("com.ibm.icu.dev.data.resources.TestDataElements", Locale.getDefault(), testLoader); rb7 = UResourceBundle.getBundleInstance("com.ibm.icu.dev.data.resources.TestDataElements", Locale.getDefault(), testLoader);
UResourceBundle.resetBundleCache();
try { try {
rb1.getBinary(); rb1.getBinary();
errln("getBinary() call should have thrown UResourceTypeMismatchException."); errln("getBinary() call should have thrown UResourceTypeMismatchException.");