1 files changed, 22 insertions, 9 deletions
diff --git a/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/config/stork/STORKConfig.java b/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/config/stork/STORKConfig.java
index f79fd6e17..4dec2c32e 100644
--- a/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/config/stork/STORKConfig.java
+++ b/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/config/stork/STORKConfig.java
@@ -25,6 +25,7 @@
  */
 package at.gv.egovernment.moa.id.config.stork;
 
+import java.io.IOException;
 import java.net.MalformedURLException;
 import java.net.URL;
 import java.util.ArrayList;
@@ -33,10 +34,15 @@ import java.util.List;
 import java.util.Map;
 import java.util.Properties;
 
+import at.gv.egovernment.moa.id.commons.db.dao.config.SAMLSigningParameter;
 import at.gv.egovernment.moa.id.commons.db.dao.config.STORK;
 import at.gv.egovernment.moa.id.commons.db.dao.config.StorkAttribute;
 import at.gv.egovernment.moa.logging.Logger;
 import at.gv.egovernment.moa.util.StringUtils;
+import org.opensaml.ws.message.encoder.MessageEncodingException;
+import org.xml.sax.SAXException;
+
+import javax.xml.parsers.ParserConfigurationException;
 
 /**
  * Encapsulates several STORK configuration parameters according MOA configuration
@@ -59,7 +65,8 @@ public class STORKConfig {
 		this.props = props;
 
 		//create CPEPS map
-		List<at.gv.egovernment.moa.id.commons.db.dao.config.CPEPS> cpeps = null;
+		//List<at.gv.egovernment.moa.id.commons.db.dao.config.CPEPS> cpeps = stork.getCPEPS();
+        List<at.gv.egovernment.moa.id.commons.db.dao.config.CPEPS> cpeps = new ArrayList<at.gv.egovernment.moa.id.commons.db.dao.config.CPEPS>();   // TODO Change this
 
         try {
             cpeps = stork.getCPEPS();
@@ -82,20 +89,26 @@ public class STORKConfig {
 							+ cpep.getCountryCode() + " has an invalid URL and is ignored.");
 				}
 			}
+            /*catch (ParserConfigurationException e) {
+				Logger.warn("Error in MOA-ID Configuration. CPEP entry for country " 
+						+ cpep.getCountryCode() + " has an invalid Attribute and is ignored.");
+			} catch (SAXException e) {
+				Logger.warn("Error in MOA-ID Configuration. CPEP entry for country " 
+						+ cpep.getCountryCode() + " has an invalid Attribute and is ignored.");
+			} catch (IOException e) {
+				Logger.warn("Error in MOA-ID Configuration. CPEP entry for country " 
+						+ cpep.getCountryCode() + " has an invalid Attribute and is ignored.");
+			} catch (MessageEncodingException e) {
+				Logger.warn("Error in MOA-ID Configuration. CPEP entry for country " 
+						+ cpep.getCountryCode() + " has an invalid Attribute and is ignored.");
+			}*/
 		}
-
 		attr = new ArrayList<StorkAttribute>();
-
-        try {
-        if (stork.getAttributes() != null) {
+		if (stork.getAttributes() != null) {
 			for(StorkAttribute current : stork.getAttributes()) {
 				attr.add(current);
 			}
 		}
-        } catch (NullPointerException ex) {
-            Logger.error("Attributes not configured!");
-
-        }
 
 	}