]> git.mxchange.org Git - pizzaservice-core.git/commitdiff
Please cherry-pick:
authorRoland Häder <roland@mxchange.org>
Fri, 26 Aug 2016 15:04:33 +0000 (17:04 +0200)
committerRoland Haeder <roland@mxchange.org>
Sat, 27 Aug 2016 14:41:51 +0000 (16:41 +0200)
- use find() and and not getReference()/merge()

src/org/mxchange/pizzaaplication/database/BasePizzaDatabaseBean.java

index bb4abd8e1734f402dcd38535bf5a43ecc1bccbd3..17e2b0d8b0fc3df816d8397cdc0e2ef54ab30574 100644 (file)
@@ -360,16 +360,13 @@ public abstract class BasePizzaDatabaseBean extends BaseDatabaseBean {
                }
 
                // Get contact from it and find it
-               Contact foundContact = this.getEntityManager().getReference(detachedContact.getClass(), detachedContact.getContactId());
+               Contact managedContact = this.getEntityManager().find(detachedContact.getClass(), detachedContact.getContactId());
 
                // Should be found
-               assert (foundContact instanceof Contact) : MessageFormat.format("Contact with id {0} not found, but should be.", detachedContact.getContactId()); //NOI18N
+               assert (managedContact instanceof Contact) : MessageFormat.format("Contact with id {0} not found, but should be.", detachedContact.getContactId()); //NOI18N
 
                // Debug message
-               this.getLoggerBeanLocal().logDebug(MessageFormat.format("{0}.updateUserPersonalData: foundContact.contactId={1}", this.getClass().getSimpleName(), foundContact.getContactId())); //NOI18N
-
-               // Merge contact instance
-               Contact managedContact = this.getEntityManager().merge(foundContact);
+               this.getLoggerBeanLocal().logDebug(MessageFormat.format("{0}.updateUserPersonalData: managedContact.contactId={1}", this.getClass().getSimpleName(), managedContact.getContactId())); //NOI18N
 
                // Is a fax number set?
                if (detachedContact.getContactFaxNumber() instanceof DialableFaxNumber) {