From fae99b84d5b8443591335560e2e2e6fbca392c01 Mon Sep 17 00:00:00 2001 From: =?utf8?q?Roland=20H=C3=A4der?= Date: Thu, 19 Jan 2023 02:20:44 +0100 Subject: [PATCH 1/1] Don't cherry-pick: - renamed variable - fixed class name --- .../org/mxchange/jjobs/enterprise/BaseJobsEnterpriseBean.java | 2 +- .../org/mxchange/jusercore/model/user/JobsUserSessionBean.java | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) 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); -- 2.39.2