From f492a2f0b42ab9c22bede8e30cb0197d6bfc4e84 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

---
 .../contact/PizzaContactSessionBean.java      | 20 +++++++------------
 .../PizzaAdminCustomerSessionBean.java        |  4 ++--
 2 files changed, 9 insertions(+), 15 deletions(-)

diff --git a/src/java/org/mxchange/jcontacts/contact/PizzaContactSessionBean.java b/src/java/org/mxchange/jcontacts/contact/PizzaContactSessionBean.java
index cd740ec..a9505ee 100644
--- a/src/java/org/mxchange/jcontacts/contact/PizzaContactSessionBean.java
+++ b/src/java/org/mxchange/jcontacts/contact/PizzaContactSessionBean.java
@@ -127,7 +127,7 @@ public class PizzaContactSessionBean extends BasePizzaDatabaseBean implements Co
 	}
 
 	@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
 
@@ -138,7 +138,7 @@ public class PizzaContactSessionBean extends BasePizzaDatabaseBean implements Co
 		} else if ((contact.getContactId() instanceof Long) && (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
@@ -146,7 +146,7 @@ public class PizzaContactSessionBean extends BasePizzaDatabaseBean implements Co
 		}
 
 		// Default is not found
-		boolean isFound = false;
+		Contact foundContact = null;
 
 		// Get whole list
 		List<Contact> contacts = this.getAllContacts();
@@ -155,7 +155,7 @@ public class PizzaContactSessionBean extends BasePizzaDatabaseBean implements Co
 		if (contacts.isEmpty()) {
 			// Then abort here
 			this.getLoggerBeanLocal().logTrace("isContactFound: No contacts registered, returning 'false' ..."); //NOI18N
-			return false;
+			return null;
 		}
 
 		// Get iterator
@@ -174,23 +174,17 @@ public class PizzaContactSessionBean extends BasePizzaDatabaseBean implements Co
 				// Debug message
 				this.getLoggerBeanLocal().logDebug(MessageFormat.format("isContactFound: Found same contact, id={0}", next.getContactId())); //NOI18N
 
-				// Set contact id
-				contact.setContactId(next.getContactId());
-
-				// Update also other ids
-				this.setAllContactPhoneEntries(contact, next);
-
 				// Found it
-				isFound = true;
+				foundContact = next;
 				break;
 			}
 		}
 
 		// Trace message
-		this.getLoggerBeanLocal().logTrace(MessageFormat.format("isContactFound: isFound={0} - EXIT!", isFound)); //NOI18N
+		this.getLoggerBeanLocal().logTrace(MessageFormat.format("isContactFound: foundContact={0} - EXIT!", foundContact)); //NOI18N
 
 		// Return status
-		return isFound;
+		return foundContact;
 	}
 
 	@Override
diff --git a/src/java/org/mxchange/pizzaapplication/model/customer/PizzaAdminCustomerSessionBean.java b/src/java/org/mxchange/pizzaapplication/model/customer/PizzaAdminCustomerSessionBean.java
index 76c1b63..d6adede 100644
--- a/src/java/org/mxchange/pizzaapplication/model/customer/PizzaAdminCustomerSessionBean.java
+++ b/src/java/org/mxchange/pizzaapplication/model/customer/PizzaAdminCustomerSessionBean.java
@@ -83,10 +83,10 @@ public class PizzaAdminCustomerSessionBean extends BasePizzaDatabaseBean impleme
 
 		// Get contact instance
 		Contact contact = customer.getCustomerContact();
-		Contact updatedContact = null;
+		Contact updatedContact = this.contactBean.lookupContact(contact);
 
 		// Is a customer found?
-		if (this.contactBean.isContactFound(contact)) {
+		if (updatedContact instanceof Contact) {
 			// Yes, then get updated version
 			updatedContact = this.contactBean.updateContactData(contact);
 
-- 
2.39.5