]> git.mxchange.org Git - pizzaservice-core.git/commitdiff
Please cherry-pick:
authorRoland Häder <roland@mxchange.org>
Fri, 23 Jun 2017 18:47:20 +0000 (20:47 +0200)
committerRoland Häder <roland@mxchange.org>
Fri, 23 Jun 2017 18:49:56 +0000 (20:49 +0200)
- renamed detachedFoo -> managedFoo
- used new copyAll() methods

Signed-off-by: Roland Häder <roland@mxchange.org>
src/org/mxchange/pizzaaplication/database/BasePizzaDatabaseBean.java

index 827a2722c30a5491a7c2fa12896107bb09381f63..b92a402e5d4d57ba3fafed56cc2b8e01485a6d3a 100644 (file)
@@ -25,6 +25,7 @@ import javax.jms.JMSException;
 import javax.jms.ObjectMessage;
 import javax.mail.Address;
 import org.mxchange.jcontacts.contact.Contact;
+import org.mxchange.jcontacts.contact.ContactUtils;
 import org.mxchange.jcoreee.database.BaseDatabaseBean;
 import org.mxchange.jmailee.model.delivery.wrapper.EmailDeliveryWrapper;
 import org.mxchange.jmailee.model.delivery.wrapper.WrapableEmailDelivery;
@@ -338,7 +339,7 @@ public abstract class BasePizzaDatabaseBean extends BaseDatabaseBean {
                managedContact.setContactUpdated(new GregorianCalendar());
 
                // Copy all
-               managedContact.copyAll(detachedContact);
+               ContactUtils.copyAll(detachedContact, managedContact);
 
                // Trace message
                this.getLoggerBeanLocal().logTrace(MessageFormat.format("{0}.mergeContactData: managedContact={1} - EXIT!", this.getClass().getSimpleName(), managedContact)); //NOI18N