From ee47dc6cdb927a4adb96fc9a4b3977c33c577008 Mon Sep 17 00:00:00 2001 From: Ian Date: Fri, 24 Feb 2023 08:17:33 -0500 Subject: [PATCH] TRUNK-6135: Reapply change to properly handle blank lockoutTimestamp --- .../org/openmrs/api/db/hibernate/HibernateContextDAO.java | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/api/src/main/java/org/openmrs/api/db/hibernate/HibernateContextDAO.java b/api/src/main/java/org/openmrs/api/db/hibernate/HibernateContextDAO.java index dcbb74177c86..addccd760f74 100644 --- a/api/src/main/java/org/openmrs/api/db/hibernate/HibernateContextDAO.java +++ b/api/src/main/java/org/openmrs/api/db/hibernate/HibernateContextDAO.java @@ -125,11 +125,11 @@ public User authenticate(String login, String password) throws ContextAuthentica log.debug("Candidate user id: {}", candidateUser.getUserId()); String lockoutTimeString = candidateUser.getUserProperty(OpenmrsConstants.USER_PROPERTY_LOCKOUT_TIMESTAMP, null); - Long lockoutTime = null; - if (lockoutTimeString != null && !"0".equals(lockoutTimeString)) { + long lockoutTime = -1; + if (StringUtils.isNotBlank(lockoutTimeString) && !"0".equals(lockoutTimeString)) { try { // putting this in a try/catch in case the admin decided to put junk into the property - lockoutTime = Long.valueOf(lockoutTimeString); + lockoutTime = Long.parseLong(lockoutTimeString); } catch (NumberFormatException e) { log.warn("bad value stored in {} user property: {}", OpenmrsConstants.USER_PROPERTY_LOCKOUT_TIMESTAMP,