From a70e5efcfb288ee8c31abeb6996a605a3a7e0dd8 Mon Sep 17 00:00:00 2001 From: =?utf8?q?Roland=20H=C3=A4der?= Date: Thu, 12 May 2016 15:06:47 +0200 Subject: [PATCH] garr, again localContact was returned empty because of confusion ... :-( Please cherry-pick this. MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit Signed-off-by: Roland Häder --- .../beans/contact/AddressbookContactWebSessionBean.java | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/src/java/org/mxchange/addressbook/beans/contact/AddressbookContactWebSessionBean.java b/src/java/org/mxchange/addressbook/beans/contact/AddressbookContactWebSessionBean.java index 6dcff572..ecf7bb51 100644 --- a/src/java/org/mxchange/addressbook/beans/contact/AddressbookContactWebSessionBean.java +++ b/src/java/org/mxchange/addressbook/beans/contact/AddressbookContactWebSessionBean.java @@ -16,6 +16,7 @@ */ package org.mxchange.addressbook.beans.contact; +import de.chotime.landingpage.beans.login.LandingUserLoginWebSessionController; import java.text.MessageFormat; import java.util.Collections; import java.util.Date; @@ -386,7 +387,7 @@ public class AddressbookContactWebSessionBean implements AddressbookContactWebSe @Override public List allContacts () { // Debug message - /* NOISY-DEBUG: */ System.out.println(MessageFormat.format("ContactController.allContacts: contactList.size()={0} - EXIT!", this.contactList.size())); + //* NOISY-DEBUG: */ System.out.println(MessageFormat.format("ContactController.allContacts: contactList.size()={0} - EXIT!", this.contactList.size())); // Return un-modified list return Collections.unmodifiableList(this.contactList); @@ -427,6 +428,7 @@ public class AddressbookContactWebSessionBean implements AddressbookContactWebSe // Debug message //* NOISY-DEBUG: */ System.out.println(MessageFormat.format("{0}.createContactInstance: this.emailAddress={1}", this.getClass().getSimpleName(), this.getEmailAddress())); + // Don't set null or wrong references if ((phone instanceof DialableLandLineNumber) && (phone.getPhoneCountry() instanceof Country) && (this.getPhoneAreaCode() != null) && (this.getPhoneNumber() != null) && (this.getPhoneAreaCode() > 0) && (this.getPhoneNumber() > 0)) { // Now the number must be given -- 2.39.5