Please cherry-pick:

- first check id number, then address

diff --git a/src/java/org/mxchange/jcontactsbusiness/model/branchoffice/PizzaAdminBranchOfficeSessionBean.java b/src/java/org/mxchange/jcontactsbusiness/model/branchoffice/PizzaAdminBranchOfficeSessionBean.java
index 5b1cf4ca86b51c452ec887c16cd481842a2dff57..f5f1f44530206ab8580f38ecf8187584522d9b16 100644 (file)
--- a/src/java/org/mxchange/jcontactsbusiness/model/branchoffice/PizzaAdminBranchOfficeSessionBean.java
+++ b/src/java/org/mxchange/jcontactsbusiness/model/branchoffice/PizzaAdminBranchOfficeSessionBean.java
@@ -19,6 +19,7 @@ package org.mxchange.jcontactsbusiness.model.branchoffice;
 import java.text.MessageFormat;
 import java.util.Date;
 import java.util.List;
+import java.util.Objects;
 import javax.ejb.EJB;
 import javax.ejb.Stateless;
 import org.mxchange.jcontacts.model.contact.Contact;
@@ -169,7 +170,7 @@ public class PizzaAdminBranchOfficeSessionBean extends BasePizzaEnterpriseBean i
                // Check all single addresses
                for (final BranchOffice bo : branchOffices) {
                        // Is the same address found?
-                       if (BranchOffices.isSameAddress(bo, branchOffice)) {
+                       if (Objects.equals(bo.getBranchId(), branchOffice.getBranchId()) || BranchOffices.isSameAddress(bo, branchOffice)) {
                                // Found one
                                isFound = true;
                                break;