From ee89ebbd26fe68ba98937f6d532bb98538232172 Mon Sep 17 00:00:00 2001
From: hieplq <hieplq@hasuvimex.vn>
Date: Thu, 3 Mar 2016 02:41:01 +0700
Subject: [PATCH] IDEMPIERE-3048:Wrong type when get AdWindow instance

---
 .../WEB-INF/src/org/adempiere/webui/adwindow/ADWindow.java  | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/adwindow/ADWindow.java b/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/adwindow/ADWindow.java
index 0ead498d12..22dca8ae37 100644
--- a/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/adwindow/ADWindow.java
+++ b/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/adwindow/ADWindow.java
@@ -219,7 +219,11 @@ public class ADWindow extends AbstractUIPart
 	 * @return adwindow instance for windowNo ( if any )
 	 */
 	public static ADWindow get(int windowNo) {
-		return (ADWindow) SessionManager.getAppDesktop().findWindow(windowNo);
+		Object window = SessionManager.getAppDesktop().findWindow(windowNo);
+		if (window != null && window instanceof ADWindow)
+			return (ADWindow) SessionManager.getAppDesktop().findWindow(windowNo);
+		
+		return null;
 	}
 	
 	/**