Apache/struts
1
0
Fork 0
mirror of https://github.com/apache/struts.git synced 2026-09-11 08:39:39 +00:00
Code Issues Packages Projects Releases Wiki Activity

Updates as stated in PR#20 comments.

Browse Source
This commit is contained in:
Luigi Fugaro
2014-07-30 14:29:03 +02:00
parent 00f424a3f6
commit da9afaf84e
1 changed files with 7 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files
xwork-core/src/main/java/com/opensymphony/xwork2/util/LocalizedTextUtil.java
+7 -8
View File
@@ -86,7 +86,7 @@ import java.util.concurrent.ConcurrentMap;
*/
public class LocalizedTextUtil {
private static final ConcurrentMap<Integer, List<String>> classLoaderMap = new ConcurrentHashMap<Integer, List<String>>();
private static final ConcurrentMap<Integer, Set<String>> classLoaderMap = new ConcurrentHashMap<Integer, Set<String>>();
private static final Logger LOG = LoggerFactory.getLogger(LocalizedTextUtil.class);
private static boolean reloadBundles = false;
private static final ConcurrentMap<String, ResourceBundle> bundlesMap = new ConcurrentHashMap<String, ResourceBundle>();
@@ -106,9 +106,9 @@ public class LocalizedTextUtil {
*/
public static void clearDefaultResourceBundles() {
ClassLoader ccl = getCurrentThreadContextClassLoader();
List<String> bundles = new ArrayList<String>();
Set<String> bundles = new HashSet<String>();
classLoaderMap.put(ccl.hashCode(), bundles);
bundles.add(0, XWORK_MESSAGES_BUNDLE);
bundles.add(XWORK_MESSAGES_BUNDLE);
}
/**
@@ -132,14 +132,13 @@ public class LocalizedTextUtil {
ClassLoader ccl = null;
synchronized (classLoaderMap) {
ccl = getCurrentThreadContextClassLoader();
List<String> bundles = classLoaderMap.get(ccl.hashCode());
Set<String> bundles = classLoaderMap.get(ccl.hashCode());
if (bundles == null) {
bundles = new ArrayList<String>();
bundles = new HashSet<String>();
classLoaderMap.put(ccl.hashCode(), bundles);
bundles.add(XWORK_MESSAGES_BUNDLE);
}
bundles.remove(resourceBundleName);
bundles.add(0, resourceBundleName);
bundles.add(resourceBundleName);
}
if (LOG.isDebugEnabled()) {
@@ -198,7 +197,7 @@ public class LocalizedTextUtil {
* @return a localized message based on the specified key, or null if no localized message can be found for it
*/
public static String findDefaultText(String aTextName, Locale locale) {
List<String> localList = classLoaderMap.get(getCurrentThreadContextClassLoader().hashCode());
Set<String> localList = classLoaderMap.get(getCurrentThreadContextClassLoader().hashCode());
for (String bundleName : localList) {
ResourceBundle bundle = findResourceBundle(bundleName, locale);