TRUNK-6135: Reapply change to properly handle blank lockoutTimestamp

Wandji69 · Jun 9, 2024 · ee47dc6 · ee47dc6
1 parent e43907c
commit ee47dc6
Showing 1 changed file with 3 additions and 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
@@ -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,