Please cherry-pick:

- always rely on "cached" lists rather than calling EJB for each request

Signed-off-by: Roland Häder <roland@mxchange.org>

diff --git a/src/java/org/mxchange/addressbook/validator/emailaddress/AddressbookEmailAddressValidator.java b/src/java/org/mxchange/addressbook/validator/emailaddress/AddressbookEmailAddressValidator.java
index 8ab45b86f1a6a516b403d8626f0e283abb5ab236..4b8c1176518be536044d12bd6f116c4b937d0445 100644 (file)
--- a/src/java/org/mxchange/addressbook/validator/emailaddress/AddressbookEmailAddressValidator.java
+++ b/src/java/org/mxchange/addressbook/validator/emailaddress/AddressbookEmailAddressValidator.java
@@ -17,6 +17,7 @@
 package org.mxchange.addressbook.validator.emailaddress;
 
 import java.text.MessageFormat;
+import java.util.List;
 import java.util.regex.Pattern;
 import javax.faces.application.FacesMessage;
 import javax.faces.component.UIComponent;
@@ -49,6 +50,11 @@ public class AddressbookEmailAddressValidator extends BaseStringValidator implem
         */
        private ContactSessionBeanRemote contactBean;
 
+       /**
+        * Cached list of all email addresses
+        */
+       private List<String> emailAddresses;
+
        /**
         * Default constructor
         */
@@ -90,6 +96,9 @@ public class AddressbookEmailAddressValidator extends BaseStringValidator implem
 
                                        // Try to lookup
                                        this.contactBean = (ContactSessionBeanRemote) initialContext.lookup("java:global/addressbook-ejb/contact!org.mxchange.jcontacts.contact.ContactSessionBeanRemote"); //NOI18N
+
+                                       // Get whole list of email addresses
+                                       this.emailAddresses = this.contactBean.getEmailAddressList();
                                } catch (final NamingException ex) {
                                        // Continue to throw it
                                        throw new ConverterException(MessageFormat.format("initialContext.lookup() failed: {0}", ex.getMessage()), ex); //NOI18N
@@ -101,13 +110,13 @@ public class AddressbookEmailAddressValidator extends BaseStringValidator implem
                String clientId = component.getClientId();
 
                // Is the email address already registered?
-               if ((!clientId.endsWith("resendEmailAddress")) && (this.contactBean.isEmailAddressRegistered(emailAddress))) { //NOI18N
+               if ((!clientId.endsWith("resendEmailAddress")) && (this.emailAddresses.contains(emailAddress))) { //NOI18N
                        // Generate message
                        String message = MessageFormat.format("Email address {0} is already registered.", emailAddress); //NOI18N
 
                        // No, then abort here
                        throw new ValidatorException(new FacesMessage(FacesMessage.SEVERITY_INFO, message, message));
-               } else if ((clientId.endsWith("resendEmailAddress")) && (!this.contactBean.isEmailAddressRegistered(emailAddress))) { //NOI18N
+               } else if ((clientId.endsWith("resendEmailAddress")) && (!this.emailAddresses.contains(emailAddress))) { //NOI18N
                        // Generate message
                        String message = MessageFormat.format("Email address {0} is not registered.", emailAddress); //NOI18N