Adding errors to be handled. Organizing error handling.

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

diff --git a/src/main/java/com/indexdata/pz2utils4jsf/config/Pz2Config.java b/src/main/java/com/indexdata/pz2utils4jsf/config/Pz2Config.java
index fc23ae2..128525b 100644 (file)
--- a/src/main/java/com/indexdata/pz2utils4jsf/config/Pz2Config.java
+++ b/src/main/java/com/indexdata/pz2utils4jsf/config/Pz2Config.java
@@ -13,6 +13,7 @@ import org.apache.log4j.Logger;
 import com.indexdata.masterkey.config.MissingMandatoryParameterException;\r
 import com.indexdata.masterkey.config.ModuleConfiguration;\r
 import com.indexdata.masterkey.config.ModuleConfigurationGetter;\r
+import com.indexdata.pz2utils4jsf.errors.ConfigurationException;\r
 import com.indexdata.pz2utils4jsf.utils.Utils;\r
 \r
 @Named @SessionScoped\r
@@ -36,11 +37,15 @@ public class Pz2Config implements ModuleConfigurationGetter, Serializable {
     }\r
   }\r
   \r
-  public Pz2Config (ModuleConfiguration moduleConfig) throws IOException {\r
+  public Pz2Config (ModuleConfiguration moduleConfig) throws ConfigurationException {\r
     logger.debug(Utils.objectId(this) + " being constructed with moduleConfig argument.");\r
     this.moduleConfig = moduleConfig;\r
-    for (String key : moduleConfig.getConfigMap().keySet()) {\r
-      properties.put(key, moduleConfig.getConfigParameter(key));\r
+    try {\r
+      for (String key : moduleConfig.getConfigMap().keySet()) {\r
+        properties.put(key, moduleConfig.getConfigParameter(key));\r
+      }\r
+    } catch (IOException e) {\r
+      throw new ConfigurationException("Could not instantiate Pazpar2 configuration: "+e.getMessage(),e);\r
     }\r
   }\r
   \r