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

minor - added comprehensive null checking.

This commit is contained in:
Heng Sin Low 2012-04-23 14:28:44 +08:00
parent 84e417a527
commit 4c4b53662f
1 changed files with 20 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/session/SessionManager.java
View File

@ -19,9 +19,12 @@ package org.adempiere.webui.session;
import java.util.Properties; import java.util.Properties;
import org.adempiere.webui.AdempiereWebUI;
import org.adempiere.webui.IWebClient; import org.adempiere.webui.IWebClient;
import org.adempiere.webui.desktop.IDesktop; import org.adempiere.webui.desktop.IDesktop;
import org.compiere.util.Env; import org.compiere.util.Env;
import org.zkoss.zk.ui.Desktop;
import org.zkoss.zk.ui.Execution;
import org.zkoss.zk.ui.Executions; import org.zkoss.zk.ui.Executions;
import org.zkoss.zk.ui.Session; import org.zkoss.zk.ui.Session;
@ -48,24 +51,29 @@ public class SessionManager
private static Session getSession() private static Session getSession()
{ {
return Executions.getCurrent().getDesktop().getSession(); Execution execution = Executions.getCurrent();
Desktop desktop = execution != null ? execution.getDesktop()
: (Desktop) Env.getCtx().get(AdempiereWebUI.ZK_DESKTOP_SESSION_KEY);
return desktop != null ? desktop.getSession() : null;
} }
public static void setSessionApplication(IWebClient app) public static void setSessionApplication(IWebClient app)
{ {
Session session = getSession(); Session session = getSession();
session.setAttribute(SESSION_APPLICATION, app); if (session != null)
session.setAttribute(SESSION_APPLICATION, app);
} }
public static IDesktop getAppDesktop() public static IDesktop getAppDesktop()
{ {
return getSessionApplication().getAppDeskop(); IWebClient webClient = getSessionApplication();
return webClient != null ? webClient.getAppDeskop() : null;
} }
public static IWebClient getSessionApplication() public static IWebClient getSessionApplication()
{ {
Session session = getSession(); Session session = getSession();
IWebClient app = (IWebClient)session.getAttribute(SESSION_APPLICATION); IWebClient app = session != null ? (IWebClient)session.getAttribute(SESSION_APPLICATION) : null;
return app; return app;
} }
@ -73,12 +81,17 @@ public class SessionManager
{ {
Env.getCtx().clear(); Env.getCtx().clear();
Session session = getSession(); Session session = getSession();
session.removeAttribute(SessionContextListener.SESSION_CTX); if (session != null)
session.invalidate(); {
session.removeAttribute(SessionContextListener.SESSION_CTX);
session.invalidate();
}
} }
public static void logoutSession() public static void logoutSession()
{ {
getSessionApplication().logout(); IWebClient app = getSessionApplication();
if (app != null)
app.logout();
} }
} }