Please cherry-pick:

[addressbook-mailer-ejb.git] / src / java / org / mxchange / jcontacts / phone / AddressbookAdminContactPhoneSessionBean.java

diff --git a/src/java/org/mxchange/jcontacts/phone/AddressbookAdminContactPhoneSessionBean.java b/src/java/org/mxchange/jcontacts/phone/AddressbookAdminContactPhoneSessionBean.java
index 00726f4cec4e61989455df0ef3cf10d329322817..1e11f923ce5a5db88a185fb2fc9f195a9a8da56f 100644 (file)
--- a/src/java/org/mxchange/jcontacts/phone/AddressbookAdminContactPhoneSessionBean.java
+++ b/src/java/org/mxchange/jcontacts/phone/AddressbookAdminContactPhoneSessionBean.java
@@ -97,8 +97,11 @@ public class AddressbookAdminContactPhoneSessionBean extends BaseAddressbookData
                // Find contact
                Contact managedContact = this.getEntityManager().find(UserContact.class, contact.getContactId());
 
+               // Merge phone number
+               DialableFaxNumber managedNumber = this.getEntityManager().merge(faxNumber);
+
                // Set fax number in contact
-               managedContact.setContactFaxNumber(faxNumber);
+               managedContact.setContactFaxNumber(managedNumber);
 
                // Trace message
                this.getLoggerBeanLocal().logTrace(MessageFormat.format("{0}.linkExistingFaxNumberWithContact: managedContact={1} - EXIT!", this.getClass().getSimpleName(), managedContact)); //NOI18N
@@ -154,8 +157,11 @@ public class AddressbookAdminContactPhoneSessionBean extends BaseAddressbookData
                // Find contact
                Contact managedContact = this.getEntityManager().find(UserContact.class, contact.getContactId());
 
-               // Set landline number in contact
-               managedContact.setContactLandLineNumber(landLineNumber);
+               // Merge phone number
+               DialableLandLineNumber managedNumber = this.getEntityManager().merge(landLineNumber);
+
+               // Set fax number in contact
+               managedContact.setContactLandLineNumber(managedNumber);
 
                // Trace message
                this.getLoggerBeanLocal().logTrace(MessageFormat.format("{0}.linkExistingLandLineNumberWithContact: managedContact={1} - EXIT!", this.getClass().getSimpleName(), managedContact)); //NOI18N
@@ -205,8 +211,11 @@ public class AddressbookAdminContactPhoneSessionBean extends BaseAddressbookData
                // Find contact
                Contact managedContact = this.getEntityManager().find(UserContact.class, contact.getContactId());
 
-               // Set landline number in contact
-               managedContact.setContactMobileNumber(mobileNumber);
+               // Merge phone number
+               DialableMobileNumber managedNumber = this.getEntityManager().merge(mobileNumber);
+
+               // Set fax number in contact
+               managedContact.setContactMobileNumber(managedNumber);
 
                // Trace message
                this.getLoggerBeanLocal().logTrace(MessageFormat.format("{0}.linkExistingMobileNumberWithContact: managedContact={1} - EXIT!", this.getClass().getSimpleName(), managedContact)); //NOI18N
@@ -262,6 +271,9 @@ public class AddressbookAdminContactPhoneSessionBean extends BaseAddressbookData
                // Persist it
                this.getEntityManager().persist(faxNumber);
 
+               // Flush it
+               this.getEntityManager().flush();
+
                // Find contact
                Contact managedContact = this.getEntityManager().find(UserContact.class, contact.getContactId());
 
@@ -322,6 +334,9 @@ public class AddressbookAdminContactPhoneSessionBean extends BaseAddressbookData
                // Persist it
                this.getEntityManager().persist(landLineNumber);
 
+               // Flush it
+               this.getEntityManager().flush();
+
                // Find contact
                Contact managedContact = this.getEntityManager().find(UserContact.class, contact.getContactId());
 
@@ -376,6 +391,9 @@ public class AddressbookAdminContactPhoneSessionBean extends BaseAddressbookData
                // Persist it
                this.getEntityManager().persist(mobileNumber);
 
+               // Flush it
+               this.getEntityManager().flush();
+
                // Find contact
                Contact managedContact = this.getEntityManager().find(UserContact.class, contact.getContactId());