From 9479a6600cfa92748c9ed022960dbcbaadcfed25 Mon Sep 17 00:00:00 2001
From: =?utf8?q?Roland=20H=C3=A4der?= <roland@mxchange.org>
Date: Tue, 26 Apr 2016 13:11:35 +0200
Subject: [PATCH] updated code logic to latest changes
MIME-Version: 1.0
Content-Type: text/plain; charset=utf8
Content-Transfer-Encoding: 8bit

Signed-off-by: Roland Häder <roland@mxchange.org>
---
 .../AddressbookContactSessionBean.java        | 26 ++++++++++---------
 1 file changed, 14 insertions(+), 12 deletions(-)

diff --git a/src/java/org/mxchange/jcontacts/contact/AddressbookContactSessionBean.java b/src/java/org/mxchange/jcontacts/contact/AddressbookContactSessionBean.java
index aa2886b..4d25853 100644
--- a/src/java/org/mxchange/jcontacts/contact/AddressbookContactSessionBean.java
+++ b/src/java/org/mxchange/jcontacts/contact/AddressbookContactSessionBean.java
@@ -19,6 +19,7 @@ package org.mxchange.jcontacts.contact;
 import java.text.MessageFormat;
 import java.util.Iterator;
 import java.util.List;
+import java.util.Objects;
 import javax.ejb.Stateless;
 import javax.persistence.NoResultException;
 import javax.persistence.Query;
@@ -132,7 +133,7 @@ public class AddressbookContactSessionBean extends BaseAddressbookDatabaseBean i
 	}
 
 	@Override
-	public boolean isContactFound (final Contact contact) {
+	public Contact lookupContact (final Contact contact) {
 		// Log trace message
 		this.getLoggerBeanLocal().logTrace(MessageFormat.format("isContactFound: contact={0} - CALLED!", contact)); //NOI18N
 
@@ -143,7 +144,7 @@ public class AddressbookContactSessionBean extends BaseAddressbookDatabaseBean i
 		} else if (contact.getContactId() > 0) {
 			try {
 				// Id set, ask other method
-				return (this.findContactById(contact.getContactId()) instanceof Contact);
+				return this.findContactById(contact.getContactId());
 			} catch (final ContactNotFoundException ex) {
 				// Not found, should not happen
 				throw new IllegalStateException(MessageFormat.format("contact.contactId={0} is set, but not found.", contact.getContactId()), ex); //NOI18N
@@ -151,7 +152,7 @@ public class AddressbookContactSessionBean extends BaseAddressbookDatabaseBean i
 		}
 
 		// Default is not found
-		boolean isFound = false;
+		Contact foundContact = null;
 
 		// Get whole list
 		List<Contact> contacts = this.getAllContacts();
@@ -160,7 +161,7 @@ public class AddressbookContactSessionBean extends BaseAddressbookDatabaseBean i
 		if (contacts.isEmpty()) {
 			// Then abort here
 			this.getLoggerBeanLocal().logTrace("isContactFound: No contacts registered, returning 'false' ..."); //NOI18N
-			return false;
+			return null;
 		}
 
 		// Get iterator
@@ -172,20 +173,21 @@ public class AddressbookContactSessionBean extends BaseAddressbookDatabaseBean i
 			Contact next = iterator.next();
 
 			// Is same contact?
-			if (ContactUtils.isSameContact(contact, next)) {
+			if ((Objects.equals(contact, next)) || (ContactUtils.isSameContact(contact, next))) {
+				// Debug message
+				this.getLoggerBeanLocal().logDebug(MessageFormat.format("isContactFound: Found same contact, id={0}", next.getContactId())); //NOI18N
+
 				// Found it
-				isFound = true;
+				foundContact = next;
 				break;
 			}
 		}
 
-		// Return status
-		return isFound;
-	}
+		// Trace message
+		this.getLoggerBeanLocal().logTrace(MessageFormat.format("isContactFound: foundContact={0} - EXIT!", foundContact)); //NOI18N
 
-	@Override
-	public Contact lookupContact (Contact contact) {
-		throw new UnsupportedOperationException("Not supported yet."); //To change body of generated methods, choose Tools | Templates.
+		// Return status
+		return foundContact;
 	}
 
 	@Override
-- 
2.39.5