Fixes authentication issues

[mkjsf-moved-to-github.git] / src / main / java / com / indexdata / mkjsf / config / WebXmlConfigReader.java

diff --git a/src/main/java/com/indexdata/mkjsf/config/WebXmlConfigReader.java b/src/main/java/com/indexdata/mkjsf/config/WebXmlConfigReader.java
index 7be0261..6772ccc 100644 (file)
--- a/src/main/java/com/indexdata/mkjsf/config/WebXmlConfigReader.java
+++ b/src/main/java/com/indexdata/mkjsf/config/WebXmlConfigReader.java
@@ -18,6 +18,7 @@ import javax.servlet.ServletContext;
 import org.apache.log4j.Logger;\r
 \r
 import com.indexdata.mkjsf.errors.ConfigurationException;\r
+import com.indexdata.mkjsf.errors.MissingConfigurationContextException;\r
 \r
 /**\r
  * Reads a configuration from the context parameters of the deployment descriptor (web.xml)\r
@@ -48,7 +49,12 @@ public class WebXmlConfigReader implements ConfigurationReader {
       \r
   private Map<String,String> readConfig () throws ConfigurationException {\r
     Map<String,String> map = new HashMap<String,String>();\r
-    ExternalContext externalContext = FacesContext.getCurrentInstance().getExternalContext();\r
+    ExternalContext externalContext = null;\r
+    try {\r
+      externalContext = FacesContext.getCurrentInstance().getExternalContext();\r
+    } catch (NullPointerException e) {\r
+      throw new MissingConfigurationContextException("WebXmlConfig: Configuration failed due to missing FacesContext.");\r
+    }\r
     ServletContext servletContext = (ServletContext) externalContext.getContext();        \r
     Enumeration<String> enumer = servletContext.getInitParameterNames();\r
     while (enumer.hasMoreElements()) {\r