From: Roland Häder <roland@mxchange.org>
Date: Fri, 23 Sep 2022 16:47:32 +0000 (+0200)
Subject: Please cherry-pick:
X-Git-Url: https://git.mxchange.org/?a=commitdiff_plain;h=33424330532f228835c892cb963f4590f0d9dac6;p=pizzaservice-ejb.git

Please cherry-pick:
- e.g. lockUserAccount() changes userAccountStatus to LOCKED which results in
  Objects.equals() to return false even when it is the same user which causes
  an exception being thrown.
- checking the userId only won't be enough for an other use-case where a new
  user with same data is being created

Signed-off-by: Roland Häder <roland@mxchange.org>
---

diff --git a/src/java/org/mxchange/jusercore/model/user/PizzaUserSessionBean.java b/src/java/org/mxchange/jusercore/model/user/PizzaUserSessionBean.java
index 4b3efdd..d18cb83 100644
--- a/src/java/org/mxchange/jusercore/model/user/PizzaUserSessionBean.java
+++ b/src/java/org/mxchange/jusercore/model/user/PizzaUserSessionBean.java
@@ -152,8 +152,15 @@ public class PizzaUserSessionBean extends BasePizzaEnterpriseBean implements Use
 
 		// Fetch whole list
 		for (final User currentUser : this.fetchAllUsers()) {
-			// Is found?
-			if (Objects.equals(user, currentUser)) {
+			/*
+			 * E.g. userAccountStatus can be fifferent because lockUserAccount
+			 * is setting it BEFORE this method is invoked. So this is enough
+			 * for us in this case. But otherwise e.g. when a new user is
+			 * created with same data, then this method must return FALSE even
+			 * when userId is currently NULL.
+			 */
+			//* NOISY-DEBUG: */ this.getLoggerBeanLocal().logDebug(MessageFormat.format("{0}.ifUserExists: currentUser={1},currentUser.userId={2}", this.getClass(), currentUser, currentUser.getUserId())); //NOI18N
+			if ((Objects.equals(user.getUserId(), currentUser.getUserId()) && user.getUserId() != null) || Objects.equals(user, currentUser)) {
 				// Yes, then set flag and exit iteration
 				isFound = true;
 				break;