From 1e7cc19d5404c3ea0ac382ccdf02c070ff959a01 Mon Sep 17 00:00:00 2001 From: Carlos Ruiz Date: Sat, 20 Oct 2012 10:44:02 -0500 Subject: [PATCH] IDEMPIERE-358 Login- how to make unique and safe / prevent NPE when filling the client box with garbage --- .../WEB-INF/src/org/adempiere/webui/panel/RolePanel.java | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) 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 c512825813..6ac67f4670 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 @@ -344,6 +344,7 @@ public class RolePanel extends Window implements EventListener, Deferrable private void updateRoleList() { lstRole.getItems().clear(); + lstRole.setText(""); Comboitem lstItemClient = lstClient.getSelectedItem(); if (lstItemClient != null) { @@ -387,7 +388,6 @@ public class RolePanel extends Window implements EventListener, Deferrable lblRole.setVisible(true); lstRole.setVisible(true); } - } setUserID(); updateOrganisationList(); @@ -491,7 +491,11 @@ public class RolePanel extends Window implements EventListener, Deferrable } private void setUserID() { - Env.setContext(m_ctx, "#AD_Client_ID", (String) lstClient.getSelectedItem().getValue()); + if (lstClient.getSelectedItem() != null) { + Env.setContext(m_ctx, "#AD_Client_ID", (String) lstClient.getSelectedItem().getValue()); + } else { + Env.setContext(m_ctx, "#AD_Client_ID", (String) null); + } MUser user = MUser.get (m_ctx, m_userName); if (user != null) { Env.setContext(m_ctx, "#AD_User_ID", user.getAD_User_ID() );