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

Embeddable: Fix multi-threaded error due to incorrect locking when lowercasing template names

Browse Source
This commit is contained in:
gnosygnu 2017-01-26 01:42:25 -05:00
parent 6867cc23b4
commit af5b7569ee
2 changed files with 5 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
400_xowa/src/gplx/xowa/addons/parsers/mediawikis/Xop_mediawiki_mgr.java
View File

@ -25,8 +25,10 @@ public class Xop_mediawiki_mgr {
Io_url root_dir = Io_url_.new_dir_(root_str); Io_url root_dir = Io_url_.new_dir_(root_str);
this.mode_is_prod = mode_is_prod; this.mode_is_prod = mode_is_prod;
if (mode_is_prod) if (mode_is_prod) {
gplx.dbs.Db_conn_bldr.Instance.Reg_default_sqlite(); gplx.dbs.Db_conn_bldr.Instance.Reg_default_sqlite();
gplx.core.envs.Env_.Init_swt(String_.Ary_empty, Type_adp_.ClassOf_obj(this)); // must call Init else unit_testing will be true
}
this.app = new Xoae_app(usr_dlg, gplx.xowa.apps.Xoa_app_mode.Itm_cmd this.app = new Xoae_app(usr_dlg, gplx.xowa.apps.Xoa_app_mode.Itm_cmd
, root_dir , root_dir
, root_dir.GenSubDir("wiki") , root_dir.GenSubDir("wiki")

14
400_xowa/src/gplx/xowa/langs/funcs/Xol_func_regy.java
View File

@ -20,7 +20,6 @@ import gplx.core.btries.*; import gplx.core.intls.*; import gplx.core.envs.*; im
import gplx.xowa.parsers.tmpls.*; import gplx.xowa.parsers.tmpls.*;
import gplx.xowa.langs.kwds.*; import gplx.xowa.langs.kwds.*;
public class Xol_func_regy { public class Xol_func_regy {
private final Object thread_lock = new Object();
private final Xoa_lang_mgr lang_mgr; private final Xol_lang_itm lang; private final Xoa_lang_mgr lang_mgr; private final Xol_lang_itm lang;
private final Btrie_slim_mgr cs_trie = Btrie_slim_mgr.cs(), ci_trie = Btrie_slim_mgr.ci_u8(); private final Btrie_slim_mgr cs_trie = Btrie_slim_mgr.cs(), ci_trie = Btrie_slim_mgr.ci_u8();
public Xol_func_regy(Xoa_lang_mgr lang_mgr, Xol_lang_itm lang) {this.lang_mgr = lang_mgr; this.lang = lang;} public Xol_func_regy(Xoa_lang_mgr lang_mgr, Xol_lang_itm lang) {this.lang_mgr = lang_mgr; this.lang = lang;}
@ -103,19 +102,10 @@ public class Xol_func_regy {
return rv; return rv;
// else {} // func_name doesn't match cur_name; continue below; EX: NAME"+"SPACENUMBER passed in and matches NAME"+"SPACE (which is cs); note that NAME"+"SPACENUMBER only exists in ci // else {} // func_name doesn't match cur_name; continue below; EX: NAME"+"SPACENUMBER passed in and matches NAME"+"SPACE (which is cs); note that NAME"+"SPACENUMBER only exists in ci
} }
LowerAry(src, bgn, end); byte[] ary = lang.Case_mgr().Case_build_lower(src, bgn, end); // NOTE: cannot call Case_reuse_lower b/c some langs (Turkish) may have differently-sized brys between upper and lower; DATE:2017-01-26
byte[] ary = lang.Case_mgr().Case_build_lower(lower_ary, 0, end - bgn); Xot_defn rv_alt = (Xot_defn)ci_trie.Match_bgn(ary, 0, ary.length);
Xot_defn rv_alt = (Xot_defn)ci_trie.Match_bgn(ary, 0, end - bgn);
return (rv != null && rv_alt == null) return (rv != null && rv_alt == null)
? rv // name not found in ci, but name was found in cs; return cs; handles NAME"+"SPACENUMBER ? rv // name not found in ci, but name was found in cs; return cs; handles NAME"+"SPACENUMBER
: rv_alt; // else return rv_alt : rv_alt; // else return rv_alt
} }
private void LowerAry(byte[] src, int bgn, int end) {
synchronized (thread_lock) {
int len = end - bgn;
if (len > lower_ary_len) {lower_ary = new byte[len]; lower_ary_len = len;}
lower_ary_len = len;
Array_.Copy_to(src, bgn, lower_ary, 0, len);
}
} byte[] lower_ary = new byte[255]; int lower_ary_len = 255;
} }