From 5688777cebee5a6e7dd27c88aed5a8f98abd690f Mon Sep 17 00:00:00 2001
From: Bojan Suzic <bojan.suzic@iaik.tugraz.at>
Date: Wed, 5 Feb 2014 14:26:46 +0100
Subject: config changes; review and correct later, configuration missing

---
 .../moa/id/config/stork/STORKConfig.java           | 22 ++++++++++++++++------
 1 file changed, 16 insertions(+), 6 deletions(-)

(limited to 'id/server/idserverlib/src/main/java/at/gv')

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 b340d2449..659035337 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
@@ -65,8 +65,9 @@ public class STORKConfig {
 		this.props = props;
 
 		//create CPEPS map
-		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 = 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
+
 		cpepsMap = new HashMap<String, CPEPS>();
 
 		for(at.gv.egovernment.moa.id.commons.db.dao.config.CPEPS cpep : cpeps) {
@@ -94,16 +95,25 @@ public class STORKConfig {
 						+ cpep.getCountryCode() + " has an invalid Attribute and is ignored.");
 			}*/
 		}
-		
-		SAMLSigningParameter samlsign = stork.getSAMLSigningParameter();   // TODO Fix nullpointerexception when nothing is configured
-		
+
+        SAMLSigningParameter samlsign = null;
+        try {
+            samlsign = stork.getSAMLSigningParameter();   // TODO Fix nullpointerexception when nothing is configured
+        }
+        catch (Exception ex) {
+            Logger.warn("Error in MOA-ID Configuration. No STORK->SAMLSigningParameter configuration found.");
+        }
+
 		if (samlsign == null) {
 			Logger.warn("Error in MOA-ID Configuration. No STORK->SAMLSigningParameter configuration found.");
 
 		attr = new ArrayList<StorkAttribute>();
+        try {
 		for(StorkAttribute current : stork.getAttributes()) {
 			attr.add(current);
-		}
+		}    } catch (Exception ex) {                                                                  // TODO FIX FIX
+            Logger.warn("Error in MOA-ID Configuration. No STORK->Attributes found.");
+        }
 
 	}
 
-- 
cgit v1.2.3