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

1003569 Handle invalidated session.

This commit is contained in:
Heng Sin Low 2013-11-28 11:22:52 +08:00
parent 25226f75a8
commit e6bdd72981
1 changed files with 22 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -69,8 +69,15 @@ public class SessionContextListener implements ExecutionInit,
*/ */
public static void setupExecutionContextFromSession(Execution exec) { public static void setupExecutionContextFromSession(Execution exec) {
Session session = exec.getDesktop().getSession(); Session session = exec.getDesktop().getSession();
Properties ctx = (Properties)session.getAttribute(SESSION_CTX); Properties ctx = null;
HttpSession httpSession = (HttpSession)session.getNativeSession(); //catch potential Session already invalidated exception
boolean sessionInvalidated = false;
try {
ctx = (Properties)session.getAttribute(SESSION_CTX);
} catch (IllegalStateException e) {
sessionInvalidated = true;
}
HttpSession httpSession = sessionInvalidated ? null : (HttpSession)session.getNativeSession();
//create empty context if there's no valid native session //create empty context if there's no valid native session
if (httpSession == null) if (httpSession == null)
{ {
@ -217,14 +224,10 @@ public class SessionContextListener implements ExecutionInit,
public void complete(Component comp, Event evt) throws Exception public void complete(Component comp, Event evt) throws Exception
{ {
//in servlet thread //in servlet thread
try { if (ServerContext.getCurrentInstance().isEmpty() || !isContextValid())
if (ServerContext.getCurrentInstance().isEmpty() || !isContextValid()) {
{ setupExecutionContextFromSession(Executions.getCurrent());
setupExecutionContextFromSession(Executions.getCurrent()); }
}
} catch (IllegalStateException e) {
//safe to ignore session already invalidated
}
} }
/** /**
@ -309,7 +312,13 @@ public class SessionContextListener implements ExecutionInit,
return false; return false;
} }
Properties sessionCtx = (Properties) session.getAttribute(SESSION_CTX); Properties sessionCtx = null;
//catch invalidated session exception
try {
sessionCtx = (Properties) session.getAttribute(SESSION_CTX);
} catch (IllegalStateException e) {
return false;
}
if (sessionCtx != null) if (sessionCtx != null)
{ {
if (Env.getAD_Client_ID(sessionCtx) != Env.getAD_Client_ID(ctx)) if (Env.getAD_Client_ID(sessionCtx) != Env.getAD_Client_ID(ctx))
@ -341,6 +350,8 @@ public class SessionContextListener implements ExecutionInit,
if (ServerContext.getCurrentInstance().isEmpty() || !isContextValid()) if (ServerContext.getCurrentInstance().isEmpty() || !isContextValid())
{ {
setupExecutionContextFromSession(Executions.getCurrent()); setupExecutionContextFromSession(Executions.getCurrent());
if (Env.getCtx().getProperty(SERVLET_SESSION_ID) == null)
return;
} }
int AD_Session_ID = Env.getContextAsInt(Env.getCtx(), "#AD_Session_ID"); int AD_Session_ID = Env.getContextAsInt(Env.getCtx(), "#AD_Session_ID");
if (AD_Session_ID > 0) { if (AD_Session_ID > 0) {