From 6fb98c8cd6dbde6fb8ededd1262f1a1728464240 Mon Sep 17 00:00:00 2001
From: =?utf8?q?Roland=20H=C3=A4der?= <roland@mxchange.org>
Date: Sun, 2 Oct 2022 16:28:47 +0200
Subject: [PATCH] Please cherry-pick: - first check id number, then address

---
 .../branchoffice/AddressbookAdminBranchOfficeSessionBean.java  | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/java/org/mxchange/jcontactsbusiness/model/branchoffice/AddressbookAdminBranchOfficeSessionBean.java b/src/java/org/mxchange/jcontactsbusiness/model/branchoffice/AddressbookAdminBranchOfficeSessionBean.java
index e303fbc..05a7fd1 100644
--- a/src/java/org/mxchange/jcontactsbusiness/model/branchoffice/AddressbookAdminBranchOfficeSessionBean.java
+++ b/src/java/org/mxchange/jcontactsbusiness/model/branchoffice/AddressbookAdminBranchOfficeSessionBean.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.addressbook.enterprise.BaseAddressbookEnterpriseBean;
@@ -149,7 +150,7 @@ public class AddressbookAdminBranchOfficeSessionBean extends BaseAddressbookEnte
 		// 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;
-- 
2.39.5