From: Roland Häder Date: Thu, 19 Jan 2023 01:20:44 +0000 (+0100) Subject: Don't cherry-pick: X-Git-Url: https://git.mxchange.org/?a=commitdiff_plain;h=fae99b84d5b8443591335560e2e2e6fbca392c01;hp=e2b54bac95629c2e921c6720d3402e82b758fbce;p=jjobs-ejb.git Don't cherry-pick: - renamed variable - fixed class name --- diff --git a/src/java/org/mxchange/jjobs/enterprise/BaseJobsEnterpriseBean.java b/src/java/org/mxchange/jjobs/enterprise/BaseJobsEnterpriseBean.java index 8926e6b..d67d257 100644 --- a/src/java/org/mxchange/jjobs/enterprise/BaseJobsEnterpriseBean.java +++ b/src/java/org/mxchange/jjobs/enterprise/BaseJobsEnterpriseBean.java @@ -753,7 +753,7 @@ public abstract class BaseJobsEnterpriseBean extends BaseEnterpriseBean { DialableFaxNumber detachedNumber = null; // Is there a difference? - if (!FaxNumbers.isSameFaxNumber(faxNumber, fetchedNumber)) { + if (!FaxNumberUtils.isSameFaxNumber(faxNumber, fetchedNumber)) { // @TODO Copy all to foundNumber, then merge // Merge this entry diff --git a/src/java/org/mxchange/jusercore/model/user/JobsUserSessionBean.java b/src/java/org/mxchange/jusercore/model/user/JobsUserSessionBean.java index d459c7e..7a43393 100644 --- a/src/java/org/mxchange/jusercore/model/user/JobsUserSessionBean.java +++ b/src/java/org/mxchange/jusercore/model/user/JobsUserSessionBean.java @@ -290,7 +290,7 @@ public class JobsUserSessionBean extends BaseJobsEnterpriseBean implements UserS assert (foundUser instanceof User) : MessageFormat.format("User with id {0} not found, but should be.", user.getUserId()); //NOI18N // Copy all data - UserUtils.copyUserData(detachedUser, foundUser); + UserUtils.copyUserData(user, foundUser); // Merge user final User managedUser = this.getEntityManager().merge(foundUser);