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

IDEMPIERE-5049 Zk Session and Desktop object not destroy immediately after logout (#997) 

- Fix invalidation of session
This commit is contained in:
hengsin 2021-11-22 21:44:33 +08:00 committed by GitHub
parent 06698688ef
commit 460a4798e9
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 8 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -409,9 +409,6 @@ public class AdempiereWebUI extends Window implements EventListener<Event>, IWeb
public void logout() public void logout()
{ {
final Desktop desktop = Executions.getCurrent().getDesktop(); final Desktop desktop = Executions.getCurrent().getDesktop();
if (desktop.isServerPushEnabled())
desktop.enableServerPush(false);
final WebApp wapp = desktop.getWebApp(); final WebApp wapp = desktop.getWebApp();
final DesktopCache desktopCache = ((WebAppCtrl) wapp).getDesktopCache(desktop.getSession()); final DesktopCache desktopCache = ((WebAppCtrl) wapp).getDesktopCache(desktop.getSession());
final Session session = logout0(); final Session session = logout0();
@ -438,7 +435,7 @@ public class AdempiereWebUI extends Window implements EventListener<Event>, IWeb
} catch (Throwable t) { } catch (Throwable t) {
t.printStackTrace(); t.printStackTrace();
} }
session.invalidate(); ((SessionCtrl)session).invalidateNow();
} }
/** /**
@ -454,6 +451,8 @@ public class AdempiereWebUI extends Window implements EventListener<Event>, IWeb
//clear context, invalidate session //clear context, invalidate session
Env.getCtx().clear(); Env.getCtx().clear();
SessionCtrl ctrl = (SessionCtrl) session;
if (!ctrl.isInvalidated() && session.getNativeSession() != null)
destroySession(session); destroySession(session);
} }

7
org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/util/DesktopWatchDog.java
View File

@ -105,12 +105,9 @@ public class DesktopWatchDog {
} }
if (!toDestroy.isEmpty()) { if (!toDestroy.isEmpty()) {
for(Session session : toDestroy) { for(Session session : toDestroy) {
try { if (!((SessionCtrl)session).isInvalidated()) {
((SessionCtrl)session).onDestroyed(); ((SessionCtrl)session).invalidateNow();
} catch (Throwable t) {
t.printStackTrace();
} }
session.invalidate();
} }
} }
} }