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

hg merge release-2.1 (merge release2.1 into development)

This commit is contained in:
Carlos Ruiz 2015-10-11 12:43:21 -05:00
parent bbb4d42d46 5da36c71f6
commit f5454af23a
1 changed files with 6 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
org.adempiere.base/src/org/compiere/model/MLookupFactory.java
View File

@ -402,7 +402,11 @@ public class MLookupFactory
} else { } else {
lang = language.getAD_Language(); lang = language.getAD_Language();
} }
StringBuilder key = new StringBuilder().append(Env.getAD_Client_ID(ctx)).append("|").append(lang).append("|").append(String.valueOf(AD_Reference_Value_ID)); StringBuilder key = new StringBuilder()
.append(Env.getAD_Client_ID(ctx)).append("|")
.append(Env.getAD_User_ID(ctx)).append("|")
.append(lang).append("|")
.append(String.valueOf(AD_Reference_Value_ID));
MLookupInfo retValue = (MLookupInfo)s_cacheRefTable.get(key.toString()); MLookupInfo retValue = (MLookupInfo)s_cacheRefTable.get(key.toString());
if (retValue != null) if (retValue != null)
{ {
@ -748,6 +752,7 @@ public class MLookupFactory
//try cache //try cache
StringBuilder cacheKey = new StringBuilder() StringBuilder cacheKey = new StringBuilder()
.append(Env.getAD_Client_ID(ctx)).append("|") .append(Env.getAD_Client_ID(ctx)).append("|")
.append(Env.getAD_User_ID(ctx)).append("|")
.append(language.getAD_Language()).append("|") .append(language.getAD_Language()).append("|")
.append(TableName).append(".") .append(TableName).append(".")
.append(KeyColumn); .append(KeyColumn);