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

IDEMPIERE-177 Complete Window Customization functionality / found issues with cache vs the window customization implementation

This commit is contained in:
Carlos Ruiz 2012-08-15 18:58:53 -05:00
parent ea3595b6b6
commit e0b518164e
2 changed files with 13 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/AdempiereWebUI.java
View File

@ -333,10 +333,7 @@ public class AdempiereWebUI extends Window implements EventListener<Event>, IWeb
appDesktop.logout(); appDesktop.logout();
Executions.getCurrent().getDesktop().getSession().getAttributes().clear(); Executions.getCurrent().getDesktop().getSession().getAttributes().clear();
MSession mSession = MSession.get(Env.getCtx(), false); AEnv.logout();
if (mSession != null) {
mSession.logout();
}
SessionManager.clearSession(); SessionManager.clearSession();
super.getChildren().clear(); super.getChildren().clear();

19
org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/apps/AEnv.java
View File

@ -49,6 +49,7 @@ import org.compiere.model.Lookup;
import org.compiere.model.MAcctSchema; import org.compiere.model.MAcctSchema;
import org.compiere.model.MLookup; import org.compiere.model.MLookup;
import org.compiere.model.MQuery; import org.compiere.model.MQuery;
import org.compiere.model.MSession;
import org.compiere.util.CCache; import org.compiere.util.CCache;
import org.compiere.util.CLogger; import org.compiere.util.CLogger;
import org.compiere.util.CacheMgt; import org.compiere.util.CacheMgt;
@ -189,9 +190,13 @@ public final class AEnv
public static void logout() public static void logout()
{ {
Env.logout(); String sessionID = Env.getContext(Env.getCtx(), "#AD_Session_ID");
windowCache.remove(sessionID);
// End Session
MSession session = MSession.get(Env.getCtx(), false); // finish
if (session != null)
session.logout();
//
} }
/** /**
@ -240,12 +245,12 @@ public final class AEnv
log.config("Window=" + WindowNo + ", AD_Window_ID=" + AD_Window_ID); log.config("Window=" + WindowNo + ", AD_Window_ID=" + AD_Window_ID);
GridWindowVO mWindowVO = null; GridWindowVO mWindowVO = null;
String locale = Env.getLanguage(Env.getCtx()).getLocale().toString(); String sessionID = Env.getContext(Env.getCtx(), "#AD_Session_ID");
if (AD_Window_ID != 0 && Ini.isCacheWindow()) // try cache if (AD_Window_ID != 0 && Ini.isCacheWindow()) // try cache
{ {
synchronized (windowCache) synchronized (windowCache)
{ {
CCache<Integer,GridWindowVO> cache = windowCache.get(locale); CCache<Integer,GridWindowVO> cache = windowCache.get(sessionID);
if (cache != null) if (cache != null)
{ {
mWindowVO = cache.get(AD_Window_ID); mWindowVO = cache.get(AD_Window_ID);
@ -267,11 +272,11 @@ public final class AEnv
{ {
synchronized (windowCache) synchronized (windowCache)
{ {
CCache<Integer,GridWindowVO> cache = windowCache.get(locale); CCache<Integer,GridWindowVO> cache = windowCache.get(sessionID);
if (cache == null) if (cache == null)
{ {
cache = new CCache<Integer, GridWindowVO>("AD_Window", 10); cache = new CCache<Integer, GridWindowVO>("AD_Window", 10);
windowCache.put(locale, cache); windowCache.put(sessionID, cache);
} }
cache.put(AD_Window_ID, mWindowVO); cache.put(AD_Window_ID, mWindowVO);
} }