aboutsummaryrefslogtreecommitdiff
path: root/id/server
diff options
context:
space:
mode:
authorBojan Suzic <bojan.suzic@iaik.tugraz.at>2014-02-05 14:26:46 +0100
committerBojan Suzic <bojan.suzic@iaik.tugraz.at>2014-02-05 14:26:46 +0100
commit5688777cebee5a6e7dd27c88aed5a8f98abd690f (patch)
tree933124446925fe6ac7edf36b26b8487e820420a0 /id/server
parent615ebd9ea9abddb951a6350b2761c06d376f5f7b (diff)
downloadmoa-id-spss-5688777cebee5a6e7dd27c88aed5a8f98abd690f.tar.gz
moa-id-spss-5688777cebee5a6e7dd27c88aed5a8f98abd690f.tar.bz2
moa-id-spss-5688777cebee5a6e7dd27c88aed5a8f98abd690f.zip
config changes; review and correct later, configuration missing
Diffstat (limited to 'id/server')
-rw-r--r--id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/config/stork/STORKConfig.java22
1 files changed, 16 insertions, 6 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 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.");
+ }
}