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

IDEMPIERE-744 Failed to invoke class org.adempiere.webui.session.SessionContextListener.

This commit is contained in:
Heng Sin Low 2013-03-18 00:29:03 +08:00
parent a2fd9d901b
commit 616b1f3b84
2 changed files with 44 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -390,11 +390,15 @@ public class AdempiereWebUI extends Window implements EventListener<Event>, IWeb
public void logout() public void logout()
{ {
Session session = logout0(); Session session = logout0();
DesktopCache desktopCache = ((SessionCtrl)session).getDesktopCache();
//clear context, invalidate session //clear context, invalidate session
Env.getCtx().clear(); Env.getCtx().clear();
session.invalidate(); session.invalidate();
if (desktopCache != null)
desktopCache.removeDesktop(Executions.getCurrent().getDesktop());
//redirect to login page //redirect to login page
Executions.sendRedirect("index.zul"); Executions.sendRedirect("index.zul");
} }

42
org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/session/SessionContextListener.java
View File

@ -275,6 +275,10 @@ public class SessionContextListener implements ExecutionInit,
Properties ctx = ServerContext.getCurrentInstance(); Properties ctx = ServerContext.getCurrentInstance();
if (ctx == null) if (ctx == null)
return false; return false;
if (exec == null || exec.getDesktop() == null)
return false;
Session session = exec.getDesktop().getSession(); Session session = exec.getDesktop().getSession();
HttpSession httpSession = (HttpSession)session.getNativeSession(); HttpSession httpSession = (HttpSession)session.getNativeSession();
//verify ctx //verify ctx
@ -306,34 +310,54 @@ public class SessionContextListener implements ExecutionInit,
@Override @Override
public void cleanup(Desktop desktop) throws Exception { public void cleanup(Desktop desktop) throws Exception {
if(Executions.getCurrent()==null) {
if (!ServerContext.getCurrentInstance().isEmpty()) {
ServerContext.dispose();
}
return;
}
if (ServerContext.getCurrentInstance().isEmpty() || !isContextValid()) if (ServerContext.getCurrentInstance().isEmpty() || !isContextValid())
{ {
if(Executions.getCurrent()==null)
return;
setupExecutionContextFromSession(Executions.getCurrent()); setupExecutionContextFromSession(Executions.getCurrent());
} }
int AD_Session_ID = Env.getContextAsInt(Env.getCtx(), "#AD_Session_ID");
if (AD_Session_ID > 0) {
String key = "ad_session."+AD_Session_ID+".desktop";
String dtid = (String) Env.getCtx().get(key);
if (dtid != null) {
if (!dtid.equals(desktop.getId())) {
return;
} else {
Env.getCtx().remove(key);
}
}
MSession mSession = MSession.get(Env.getCtx(), false); MSession mSession = MSession.get(Env.getCtx(), false);
if(mSession!=null && !mSession.isProcessed() && (Env.getContext(Env.getCtx(), "isReloaded")==null || Env.getContext(Env.getCtx(), "isReloaded").equals("") || Env.getContext(Env.getCtx(), "isReloaded").equals("N"))){ if(mSession!=null && !mSession.isProcessed()) {
mSession.setProcessed(true); mSession.setProcessed(true);
mSession.saveEx(); mSession.saveEx();
} }
Env.setContext(Env.getCtx(), "isReloaded", "N"); }
} }
@Override @Override
public void init(Desktop desktop, Object request) throws Exception { public void init(Desktop desktop, Object request) throws Exception {
if(Executions.getCurrent()==null)
return;
if (ServerContext.getCurrentInstance().isEmpty() || !isContextValid()) if (ServerContext.getCurrentInstance().isEmpty() || !isContextValid())
{ {
if(Executions.getCurrent()!=null)
setupExecutionContextFromSession(Executions.getCurrent()); setupExecutionContextFromSession(Executions.getCurrent());
} }
MSession mSession = MSession.get(Env.getCtx(), false); MSession mSession = MSession.get(Env.getCtx(), false);
if(mSession!=null && mSession.isProcessed()){ if(mSession!=null){
if (mSession.isProcessed()) {
mSession.setProcessed(false); mSession.setProcessed(false);
mSession.saveEx(); mSession.saveEx();
}else if(mSession!=null){ }
Env.setContext(Env.getCtx(), "isReloaded", "Y"); Env.getCtx().put("ad_session."+mSession.getAD_Session_ID()+".desktop", desktop.getId());
} }
} }
} }