From 624b14b51f94d2cd3b508b4d3497c3d82d8a3cdb Mon Sep 17 00:00:00 2001
From: Heng Sin Low <hengsin@gmail.com>
Date: Sat, 11 Nov 2017 21:49:02 +0800
Subject: [PATCH] IDEMPIERE-3538 NPE happen if show dialog at time not yet
 complete login

---
 .../WEB-INF/src/org/adempiere/webui/AdempiereWebUI.java    | 7 +++++++
 .../WEB-INF/src/org/adempiere/webui/ClientInfo.java        | 2 +-
 .../WEB-INF/src/org/adempiere/webui/IWebClient.java        | 5 ++++-
 3 files changed, 12 insertions(+), 2 deletions(-)

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 c3f3c00ef9..edc0fe7aba 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
@@ -459,6 +459,8 @@ public class AdempiereWebUI extends Window implements EventListener<Event>, IWeb
 			}
 			if (getDesktop() != null && getDesktop().getSession() != null) {
 				getDesktop().getSession().setAttribute(CLIENT_INFO, clientInfo);
+			} else if (Executions.getCurrent() != null){
+				Executions.getCurrent().getSession().setAttribute(CLIENT_INFO, clientInfo);
 			}
 			
 			Env.setContext(Env.getCtx(), "#clientInfo_desktopWidth", clientInfo.desktopWidth);
@@ -540,6 +542,11 @@ public class AdempiereWebUI extends Window implements EventListener<Event>, IWeb
 		Executions.sendRedirect("index.zul");
 	}
 	
+	@Override
+	public ClientInfo getClientInfo() {
+		return clientInfo;
+	}
+	
 	/**
 	 * @return string for setupload
 	 */
diff --git a/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/ClientInfo.java b/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/ClientInfo.java
index 0dcd074d24..5cb588d96d 100644
--- a/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/ClientInfo.java
+++ b/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/ClientInfo.java
@@ -103,7 +103,7 @@ public class ClientInfo implements Serializable {
 	 * @return the current clientinfo instance
 	 */
 	public static ClientInfo get() {
-		return SessionManager.getAppDesktop().getClientInfo();
+		return SessionManager.getSessionApplication().getClientInfo();
 	}
 	
 	/**
diff --git a/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/IWebClient.java b/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/IWebClient.java
index f06952a169..59f783b7ef 100644
--- a/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/IWebClient.java
+++ b/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/IWebClient.java
@@ -67,5 +67,8 @@ public interface IWebClient {
 	 * @return keylistener
 	 */
 	public abstract Keylistener getKeylistener();
-
+	
+	default ClientInfo getClientInfo() {
+		return getAppDeskop().getClientInfo();
+	}
 }
\ No newline at end of file