From 5a98f91a8acc6f01880fa76ef85a6ad7a845ffdc Mon Sep 17 00:00:00 2001
From: hengsin <hengsin@gmail.com>
Date: Mon, 7 Feb 2022 18:47:20 +0800
Subject: [PATCH] IDEMPIERE-5049 Zk Session and Desktop object not destroy
 immediately after logout (#1164)

Fix desktop doesn't timeout after access through http
---
 .../WEB-INF/src/org/adempiere/webui/AdempiereWebUI.java          | 1 -
 .../WEB-INF/src/org/adempiere/webui/util/Statistic.java          | 1 +
 2 files changed, 1 insertion(+), 1 deletion(-)

diff --git a/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/AdempiereWebUI.java b/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/AdempiereWebUI.java
index 9387aa047c..eaed371870 100644
--- a/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/AdempiereWebUI.java
+++ b/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/AdempiereWebUI.java
@@ -151,7 +151,6 @@ public class AdempiereWebUI extends Window implements EventListener<Event>, IWeb
 		this.getPage().setTitle(ThemeManager.getBrowserTitle());
         
         Executions.getCurrent().getDesktop().enableServerPush(true);
-        DesktopWatchDog.addDesktop(Executions.getCurrent().getDesktop());
         
         SessionManager.setSessionApplication(this);
         final Session session = Executions.getCurrent().getDesktop().getSession();
diff --git a/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/util/Statistic.java b/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/util/Statistic.java
index ee6b29f4b7..7b1bfc1e50 100644
--- a/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/util/Statistic.java
+++ b/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/util/Statistic.java
@@ -137,6 +137,7 @@ public class Statistic implements Monitor {
 	public void desktopCreated(Desktop desktop) {
 		_ndt.increment();
 		_actdt.increment();
+		DesktopWatchDog.addDesktop(desktop);
 	}
 
 	@Override