Archives/gnosygnu_xowa
1
0
Fork 0
mirror of https://github.com/gnosygnu/xowa.git synced 2024-10-27 20:34:16 +00:00
Code Issues Projects Releases Wiki Activity

Html_dump: Synchronize Xol_name_mgr [#549]

Browse Source
This commit is contained in:
gnosygnu 2019-08-14 08:03:20 -04:00
parent 41e9fc1287
commit 1e254caa79
1 changed files with 5 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
400_xowa/src/gplx/xowa/langs/names/Xol_name_mgr.java
View File

@ -21,6 +21,7 @@ public class Xol_name_mgr {
private final Cldr_name_loader cldr_loader; private final Cldr_name_loader cldr_loader;
private final Language_name_loader name_loader; private final Language_name_loader name_loader;
private final Io_url root_dir; private final Io_url root_dir;
private final Object thread_lock = new Object(); // THREAD:Xol_name_mgr can be used by multiple wiki threads; ISSUE#:549; DATE:2019-08-14
// private Ordered_hash hash; // private Ordered_hash hash;
// private Keyval[] kvs; // private Keyval[] kvs;
@ -37,12 +38,14 @@ public class Xol_name_mgr {
* @since 1.20 * @since 1.20
*/ */
public String fetchLanguageName(String code, String inLanguage, String include, byte[] page_url) { public String fetchLanguageName(String code, String inLanguage, String include, byte[] page_url) {
synchronized (thread_lock) {
code = String_.Lower(code); code = String_.Lower(code);
if (include == null) include = Scope__str__all; if (include == null) include = Scope__str__all;
Ordered_hash array = fetchLanguageNames(inLanguage, include, page_url); Ordered_hash array = fetchLanguageNames(inLanguage, include, page_url);
Keyval rv = (Keyval)array.Get_by(code); Keyval rv = (Keyval)array.Get_by(code);
return rv == null ? "" : rv.Val_to_str_or_null(); return rv == null ? "" : rv.Val_to_str_or_null();
} }
}
/** /**
* Get an array of language names, indexed by code. * Get an array of language names, indexed by code.
* @param null|String $inLanguage Code of language in which to return the names * @param null|String $inLanguage Code of language in which to return the names
@ -60,6 +63,7 @@ public class Xol_name_mgr {
private Ordered_hash lang_files_cached; private Ordered_hash lang_files_cached;
public Ordered_hash fetchLanguageNames(String inLanguage, String include_str, byte[] page_url) { public Ordered_hash fetchLanguageNames(String inLanguage, String include_str, byte[] page_url) {
synchronized (thread_lock) {
if (inLanguage == null) inLanguage = "null"; if (inLanguage == null) inLanguage = "null";
String cacheKey = inLanguage + ":" + include_str; String cacheKey = inLanguage + ":" + include_str;
if (languageNameCache == null) if (languageNameCache == null)
@ -90,6 +94,7 @@ public class Xol_name_mgr {
languageNameCache.Add(cacheKey, ret); languageNameCache.Add(cacheKey, ret);
} }
return ret; return ret;
}
/* /*
$ret = self::$languageNameCache->get( $cacheKey ); $ret = self::$languageNameCache->get( $cacheKey );
if ( !$ret ) { if ( !$ret ) {