From 96508b61f7bd4bf500d402a12045655304bc9741 Mon Sep 17 00:00:00 2001
From: hieplq <hieplq@hasuvimex.vn>
Date: Thu, 25 Jul 2019 21:58:09 +0700
Subject: [PATCH] IDEMPIERE-1937:same for change password pannel

SessionManager.logoutSession() clean current Execution, so Executions.getCurrent() return null
so List<String> browserLanguages = browserLanguages(Executions.getCurrent().getHeader("accept-language"));
on LoginPanel make NPE
---
 .../src/org/adempiere/webui/panel/ChangePasswordPanel.java      | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/panel/ChangePasswordPanel.java b/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/panel/ChangePasswordPanel.java
index b21860250b..d7fa01a425 100644
--- a/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/panel/ChangePasswordPanel.java
+++ b/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/panel/ChangePasswordPanel.java
@@ -277,7 +277,7 @@ public class ChangePasswordPanel extends Window implements EventListener<Event>
         else if (event.getTarget().getId().equals(ConfirmPanel.A_CANCEL))
         {
         	SessionManager.logoutSession();
-            wndLogin.loginCancelled();
+            //wndLogin.loginCancelled();
         }
         else if (event.getTarget() == txtNewPassword) {
         	MPasswordRule pwdrule = MPasswordRule.getRules(Env.getCtx(), null);