From: Roland Häder <roland@mxchange.org>
Date: Sun, 2 Oct 2022 14:28:47 +0000 (+0200)
Subject: Please cherry-pick:
X-Git-Url: https://git.mxchange.org/?a=commitdiff_plain;h=922e445b023b9d01591b24c0bf31b8193e6f702a;p=jjobs-ejb.git

Please cherry-pick:
- first check id number, then address
---

diff --git a/src/java/org/mxchange/jcontactsbusiness/model/branchoffice/JobsAdminBranchOfficeSessionBean.java b/src/java/org/mxchange/jcontactsbusiness/model/branchoffice/JobsAdminBranchOfficeSessionBean.java
index 5a4a726..32e1c08 100644
--- a/src/java/org/mxchange/jcontactsbusiness/model/branchoffice/JobsAdminBranchOfficeSessionBean.java
+++ b/src/java/org/mxchange/jcontactsbusiness/model/branchoffice/JobsAdminBranchOfficeSessionBean.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;
@@ -202,7 +203,7 @@ public class JobsAdminBranchOfficeSessionBean extends BaseJobsEnterpriseBean imp
 		// 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;