From b875bd411bc84727996a9ba98bd204c8f0cad6ab Mon Sep 17 00:00:00 2001 From: Elaine Tan Date: Mon, 1 Oct 2012 17:56:05 +0800 Subject: [PATCH] IDEMPIERE-373 Implement User Locking - fix locking error message when involving multi-clients user --- org.adempiere.base/src/org/compiere/util/Login.java | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-) diff --git a/org.adempiere.base/src/org/compiere/util/Login.java b/org.adempiere.base/src/org/compiere/util/Login.java index 4c74695bca..43145f803e 100644 --- a/org.adempiere.base/src/org/compiere/util/Login.java +++ b/org.adempiere.base/src/org/compiere/util/Login.java @@ -1464,13 +1464,13 @@ public class Login } else { + boolean foundLockedAccount = false; for (MUser user : users) { if (user.isLocked()) { - // User account ({0}) is locked, please contact the system administrator - loginErrMsg = Msg.getMsg(m_ctx, "UserAccountLocked", new Object[] {app_user}); - break; + foundLockedAccount = true; + continue; } int count = user.getFailedLoginCount() + 1; @@ -1500,6 +1500,12 @@ public class Login if (!user.save()) log.severe("Failed to update user record with increase failed login count"); } + + if (loginErrMsg == null && foundLockedAccount) + { + // User account ({0}) is locked, please contact the system administrator + loginErrMsg = Msg.getMsg(m_ctx, "UserAccountLocked", new Object[] {app_user}); + } } return retValue; }