From 91de1b4358c482f0be8203c4ea122021d0e61a45 Mon Sep 17 00:00:00 2001
From: hieplq <hieplq@hasuvimex.vn>
Date: Thu, 23 Oct 2014 11:49:19 +0700
Subject: [PATCH] IDEMPIERE-1937:zk7: NPE when click cancel from screen "change
 role" when login and "forget password"

---
 .../src/org/adempiere/webui/panel/ResetPasswordPanel.java     | 4 ++--
 .../WEB-INF/src/org/adempiere/webui/panel/RolePanel.java      | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/panel/ResetPasswordPanel.java b/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/panel/ResetPasswordPanel.java
index 20399406c6..09a6574882 100644
--- a/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/panel/ResetPasswordPanel.java
+++ b/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/panel/ResetPasswordPanel.java
@@ -320,7 +320,7 @@ public class ResetPasswordPanel extends Window implements EventListener<Event>
         else if (event.getTarget().getId().equals(ConfirmPanel.A_CANCEL))
         {
         	SessionManager.logoutSession();
-            wndLogin.loginCancelled();
+            //wndLogin.loginCancelled();
         }
     }
     
@@ -490,7 +490,7 @@ public class ResetPasswordPanel extends Window implements EventListener<Event>
 				@Override
 				public void onCallback(Integer result) {
 		        	SessionManager.logoutSession();
-		        	wndLogin.loginCancelled();
+		        	//wndLogin.loginCancelled();
 				}
 				
 			});
diff --git a/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/panel/RolePanel.java b/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/panel/RolePanel.java
index 91864b9b24..3d94853fee 100644
--- a/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/panel/RolePanel.java
+++ b/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/panel/RolePanel.java
@@ -535,13 +535,13 @@ public class RolePanel extends Window implements EventListener<Event>, Deferrabl
         	} else {
         		ctxBeforeChangeRole = null;
         		SessionManager.logoutSession();
-        		wndLogin.loginCancelled();
+        		//wndLogin.loginCancelled();
         	}
         }
 		else if (ON_DEFER_LOGOUT.equals(event.getName()))
 		{
             SessionManager.logoutSession();
-            wndLogin.loginCancelled();
+            //wndLogin.loginCancelled();
 		}
     }