Please cherry-pick:

[jjobs-war.git] / src / java / org / mxchange / jjobs / converter / mobile / JobsMobileNumberConverter.java

diff --git a/src/java/org/mxchange/jjobs/converter/mobile/JobsMobileNumberConverter.java b/src/java/org/mxchange/jjobs/converter/mobile/JobsMobileNumberConverter.java
index fe71466336d207258e5ee58755b84317feaa8893..2cf27482a01c837748936c6f0b756635583846ea 100644 (file)
--- a/src/java/org/mxchange/jjobs/converter/mobile/JobsMobileNumberConverter.java
+++ b/src/java/org/mxchange/jjobs/converter/mobile/JobsMobileNumberConverter.java
@@ -16,16 +16,12 @@
  */
 package org.mxchange.jjobs.converter.mobile;
 
-import javax.faces.application.FacesMessage;
+import javax.enterprise.inject.spi.CDI;
 import javax.faces.component.UIComponent;
 import javax.faces.context.FacesContext;
 import javax.faces.convert.Converter;
 import javax.faces.convert.ConverterException;
 import javax.faces.convert.FacesConverter;
-import javax.faces.validator.ValidatorException;
-import javax.naming.Context;
-import javax.naming.InitialContext;
-import javax.naming.NamingException;
 import org.mxchange.jjobs.beans.phone.JobsPhoneWebRequestBean;
 import org.mxchange.jjobs.beans.phone.JobsPhoneWebRequestController;
 import org.mxchange.jphone.exceptions.phone.PhoneEntityNotFoundException;
@@ -48,16 +44,8 @@ public class JobsMobileNumberConverter implements Converter<DialableMobileNumber
        public DialableMobileNumber getAsObject (final FacesContext context, final UIComponent component, final String submittedValue) {
                // Is the instance there?
                if (PHONE_CONTROLLER == null) {
-                       try {
-                               // Not yet, attempt lookup
-                               final Context initial = new InitialContext();
-
-                               // Lookup EJB
-                               PHONE_CONTROLLER = (JobsPhoneWebRequestController) initial.lookup(String.format("java:module/%s", JobsPhoneWebRequestBean.class.getSimpleName())); //NOI18N
-                       } catch (final NamingException ex) {
-                               // Throw it again
-                               throw new ValidatorException(new FacesMessage(FacesMessage.SEVERITY_ERROR, "Cannot lookup backing bean", ex.getMessage()), ex);
-                       }
+                       // Get bean from CDI directly
+                       PHONE_CONTROLLER = CDI.current().select(JobsPhoneWebRequestBean.class).get();
                }
 
                // Is the value null or empty?