From: Roland Häder <roland@mxchange.org>
Date: Thu, 11 Aug 2016 12:26:39 +0000 (+0200)
Subject: Tried to fix: (please cherry-pick)
X-Git-Url: https://git.mxchange.org/?a=commitdiff_plain;h=18ff38329be36cf300a713962aeab30b29ffcc49;p=addressbook-mailer-ejb.git

Tried to fix: (please cherry-pick)
- update all data in user instance and hande it over to updateUserData()
---

diff --git a/src/java/org/mxchange/jusercore/model/user/AddressbookAdminUserSessionBean.java b/src/java/org/mxchange/jusercore/model/user/AddressbookAdminUserSessionBean.java
index 5b2e102..c9853a4 100644
--- a/src/java/org/mxchange/jusercore/model/user/AddressbookAdminUserSessionBean.java
+++ b/src/java/org/mxchange/jusercore/model/user/AddressbookAdminUserSessionBean.java
@@ -207,25 +207,10 @@ public class AddressbookAdminUserSessionBean extends BaseAddressbookDatabaseBean
 		// Remove contact instance as this is not updated
 		user.setUserContact(null);
 
-		// Find the instance
-		User foundUser = this.getEntityManager().find(user.getClass(), user.getUserId());
-
-		// Should be found!
-		assert (foundUser instanceof User) : MessageFormat.format("User with id {0} not found, but should be.", user.getUserId()); //NOI18N
-
-		// Copy all data
-		foundUser.copyAll(user);
-
-		// Set as locked
-		foundUser.setUserAccountStatus(UserAccountStatus.LOCKED);
-		foundUser.setUserLastLocked(new GregorianCalendar());
-		foundUser.setUserLastLockedReason(userLockReason);
-
-		// Merge user
-		User detachedUser = this.getEntityManager().merge(foundUser);
-
-		// Should be found!
-		assert (detachedUser instanceof User) : MessageFormat.format("User with id {0} not merged, but should be.", user.getUserId()); //NOI18N
+		// Set as locked, set timestamp and lock reason
+		user.setUserAccountStatus(UserAccountStatus.LOCKED);
+		user.setUserLastLocked(new GregorianCalendar());
+		user.setUserLastLockedReason(userLockReason);
 
 		// Update user
 		User updatedUser = this.userBean.updateUserData(user);
@@ -247,10 +232,10 @@ public class AddressbookAdminUserSessionBean extends BaseAddressbookDatabaseBean
 		this.sendEmail("Account locked", "account_locked", emailAddress, updatedUser, baseUrl); //NOI18N
 
 		// Trace message
-		this.getLoggerBeanLocal().logTrace(MessageFormat.format("{0}.lockUserAccount: detachedUser={1} - EXIT!", this.getClass().getSimpleName(), detachedUser)); //NOI18N
+		this.getLoggerBeanLocal().logTrace(MessageFormat.format("{0}.lockUserAccount: updatedUser={1} - EXIT!", this.getClass().getSimpleName(), updatedUser)); //NOI18N
 
 		// Return detached (and updated) user
-		return detachedUser;
+		return updatedUser;
 	}
 
 	@Override
@@ -294,23 +279,8 @@ public class AddressbookAdminUserSessionBean extends BaseAddressbookDatabaseBean
 		// Remove contact instance as this is not updated
 		user.setUserContact(null);
 
-		// Find the instance
-		User foundUser = this.getEntityManager().find(user.getClass(), user.getUserId());
-
-		// Should be found!
-		assert (foundUser instanceof User) : MessageFormat.format("User with id {0} not found, but should be.", user.getUserId()); //NOI18N
-
-		// Copy all data
-		foundUser.copyAll(user);
-
 		// Unlock account
-		foundUser.setUserAccountStatus(UserAccountStatus.CONFIRMED);
-
-		// Merge user
-		User detachedUser = this.getEntityManager().merge(foundUser);
-
-		// Should be found!
-		assert (detachedUser instanceof User) : MessageFormat.format("User with id {0} not merged, but should be.", user.getUserId()); //NOI18N
+		user.setUserAccountStatus(UserAccountStatus.CONFIRMED);
 
 		// Update user
 		User updatedUser = this.userBean.updateUserData(user);
@@ -332,10 +302,10 @@ public class AddressbookAdminUserSessionBean extends BaseAddressbookDatabaseBean
 		this.sendEmail("Account unlocked", "account_unlocked", emailAddress, updatedUser, baseUrl); //NOI18N
 
 		// Trace message
-		this.getLoggerBeanLocal().logTrace(MessageFormat.format("{0}.lockUserAccount: detachedUser={1} - EXIT!", this.getClass().getSimpleName(), detachedUser)); //NOI18N
+		this.getLoggerBeanLocal().logTrace(MessageFormat.format("{0}.lockUserAccount: updatedUser={1} - EXIT!", this.getClass().getSimpleName(), updatedUser)); //NOI18N
 
 		// Return changed account
-		return detachedUser;
+		return updatedUser;
 	}
 
 }