midsuit
/
core-jgi
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

IDEMPIERE-3967 SysConfig without cache

This commit is contained in:
Carlos Ruiz 2019-05-09 13:12:23 +02:00
parent a1a496d253
commit a54fd56ffd
1 changed files with 15 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
org.adempiere.base/src/org/compiere/model/MSysConfig.java
View File

@ -420,12 +420,15 @@ public class MSysConfig extends X_AD_SysConfig
public static String getValue(String Name, String defaultValue, int AD_Client_ID, int AD_Org_ID) public static String getValue(String Name, String defaultValue, int AD_Client_ID, int AD_Org_ID)
{ {
String key = ""+AD_Client_ID+"_"+AD_Org_ID+"_"+Name; String key = ""+AD_Client_ID+"_"+AD_Org_ID+"_"+Name;
String str = s_cache.get(key); String str = null;
if (str != null) if (! Name.endsWith("_NOCACHE")) {
return str; str = s_cache.get(key);
if (str == null && s_cache.containsKey(key)) // found null key if (str != null)
return defaultValue; return str;
if (str == null && s_cache.containsKey(key)) // found null key
return defaultValue;
}
// //
String sql = "SELECT Value FROM AD_SysConfig" String sql = "SELECT Value FROM AD_SysConfig"
+ " WHERE Name=? AND AD_Client_ID IN (0, ?) AND AD_Org_ID IN (0, ?) AND IsActive='Y'" + " WHERE Name=? AND AD_Client_ID IN (0, ?) AND AD_Org_ID IN (0, ?) AND IsActive='Y'"
@ -452,13 +455,15 @@ public class MSysConfig extends X_AD_SysConfig
rs = null; pstmt = null; rs = null; pstmt = null;
} }
// //
if (str != null) { if (str != null) {
s_cache.put(key, str); if (! Name.endsWith("_NOCACHE"))
s_cache.put(key, str);
return str; return str;
} } else {
else {
// anyways, put the not found key as null // anyways, put the not found key as null
s_cache.put(key, null); if (! Name.endsWith("_NOCACHE"))
s_cache.put(key, null);
return defaultValue; return defaultValue;
} }
} }