From 193954e7d7f6e4be750891e56317f2df5e580ff0 Mon Sep 17 00:00:00 2001 From: Deepak Pansheriya Date: Wed, 24 Oct 2012 00:26:17 +0530 Subject: [PATCH] IDEMPIERE-293 Fixing exception thrown on session timeout --- .../adempiere/webui/session/SessionContextListener.java | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/session/SessionContextListener.java b/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/session/SessionContextListener.java index cf3c9ff121..67688cf5ef 100644 --- a/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/session/SessionContextListener.java +++ b/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/session/SessionContextListener.java @@ -308,7 +308,10 @@ public class SessionContextListener implements ExecutionInit, public void cleanup(Desktop desktop) throws Exception { if (ServerContext.getCurrentInstance().isEmpty() || !isContextValid()) { - setupExecutionContextFromSession(Executions.getCurrent()); + if(Executions.getCurrent()==null) + return; + + setupExecutionContextFromSession(Executions.getCurrent()); } 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"))){ @@ -322,7 +325,8 @@ public class SessionContextListener implements ExecutionInit, public void init(Desktop desktop, Object request) throws Exception { if (ServerContext.getCurrentInstance().isEmpty() || !isContextValid()) { - setupExecutionContextFromSession(Executions.getCurrent()); + if(Executions.getCurrent()!=null) + setupExecutionContextFromSession(Executions.getCurrent()); } MSession mSession = MSession.get(Env.getCtx(), false); if(mSession!=null && mSession.isProcessed()){