Please cherry-pick:

[pizzaservice-core.git] / src / org / mxchange / pizzaaplication / database / BasePizzaDatabaseBean.java

diff --git a/src/org/mxchange/pizzaaplication/database/BasePizzaDatabaseBean.java b/src/org/mxchange/pizzaaplication/database/BasePizzaDatabaseBean.java
index 827a2722c30a5491a7c2fa12896107bb09381f63..359223c7bd3be9163f63453c06f189ce98a0c90f 100644 (file)
--- a/src/org/mxchange/pizzaaplication/database/BasePizzaDatabaseBean.java
+++ b/src/org/mxchange/pizzaaplication/database/BasePizzaDatabaseBean.java
@@ -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
@@ -500,7 +501,12 @@ public abstract class BasePizzaDatabaseBean extends BaseDatabaseBean {
 
                // Set base URL and random password
                variables.put("baseUrl", baseUrl); //NOI18N
-               variables.put("randomPassword", randomPassword); //NOI18N
+               variables.put("randomPassword", ""); //NOI18N
+
+               // Is the random password set?
+               if ((randomPassword instanceof String) && (!randomPassword.isEmpty())) {
+                       variables.put("randomPassword", randomPassword); //NOI18N
+               }
 
                // Set all
                // @TODO Language from message bundle