aboutsummaryrefslogtreecommitdiff
path: root/id/ConfigWebTool
diff options
context:
space:
mode:
authorThomas Lenz <tlenz@iaik.tugraz.at>2014-05-26 14:47:36 +0200
committerThomas Lenz <tlenz@iaik.tugraz.at>2014-05-26 14:47:36 +0200
commit54144b697bd1a5c4b08e8da9fec655afd949446c (patch)
treeb3a02bf7013e18f51d1aa012d241003bc5cfa5ef /id/ConfigWebTool
parent1c5fbb27d5d3b143bfa47153efd245b1270ba951 (diff)
downloadmoa-id-spss-54144b697bd1a5c4b08e8da9fec655afd949446c.tar.gz
moa-id-spss-54144b697bd1a5c4b08e8da9fec655afd949446c.tar.bz2
moa-id-spss-54144b697bd1a5c4b08e8da9fec655afd949446c.zip
fix different STORK bugs
Diffstat (limited to 'id/ConfigWebTool')
-rw-r--r--id/ConfigWebTool/src/main/java/at/gv/egovernment/moa/id/configuration/data/oa/OASTORKConfig.java12
-rw-r--r--id/ConfigWebTool/src/main/java/at/gv/egovernment/moa/id/configuration/struts/action/EditOAAction.java18
-rw-r--r--id/ConfigWebTool/src/main/java/at/gv/egovernment/moa/id/configuration/validation/oa/OAPVP2ConfigValidation.java4
3 files changed, 24 insertions, 10 deletions
diff --git a/id/ConfigWebTool/src/main/java/at/gv/egovernment/moa/id/configuration/data/oa/OASTORKConfig.java b/id/ConfigWebTool/src/main/java/at/gv/egovernment/moa/id/configuration/data/oa/OASTORKConfig.java
index be5b2200b..363c094ff 100644
--- a/id/ConfigWebTool/src/main/java/at/gv/egovernment/moa/id/configuration/data/oa/OASTORKConfig.java
+++ b/id/ConfigWebTool/src/main/java/at/gv/egovernment/moa/id/configuration/data/oa/OASTORKConfig.java
@@ -253,9 +253,15 @@ public class OASTORKConfig implements IOnlineApplicationData{
public List<CPEPS> getEnabledCPEPS() {
if (enabledCitizenCountries != null) {
List<CPEPS> result = new ArrayList<CPEPS>();
- for(CPEPS current : ConfigurationDBRead.getMOAIDConfiguration().getAuthComponentGeneral().getForeignIdentities().getSTORK().getCPEPS()) {
- if(enabledCitizenCountries.contains(current.getCountryCode()))
- result.add(current);
+
+ try {
+ for(CPEPS current : ConfigurationDBRead.getMOAIDConfiguration().getAuthComponentGeneral().getForeignIdentities().getSTORK().getCPEPS()) {
+ if(enabledCitizenCountries.contains(current.getCountryCode()))
+ result.add(current);
+ }
+
+ } catch (NullPointerException e){
+
}
return result;
}
diff --git a/id/ConfigWebTool/src/main/java/at/gv/egovernment/moa/id/configuration/struts/action/EditOAAction.java b/id/ConfigWebTool/src/main/java/at/gv/egovernment/moa/id/configuration/struts/action/EditOAAction.java
index 659835d03..9509f9712 100644
--- a/id/ConfigWebTool/src/main/java/at/gv/egovernment/moa/id/configuration/struts/action/EditOAAction.java
+++ b/id/ConfigWebTool/src/main/java/at/gv/egovernment/moa/id/configuration/struts/action/EditOAAction.java
@@ -133,12 +133,20 @@ public class EditOAAction extends BasicOAAction {
// prepare attribute helper list
ArrayList<AttributeHelper> attributes = new ArrayList<AttributeHelper>();
- for (StorkAttribute current : ConfigurationDBRead
- .getMOAIDConfiguration().getAuthComponentGeneral()
- .getForeignIdentities().getSTORK().getAttributes())
- attributes.add(new AttributeHelper(current));
- getStorkOA().setHelperAttributes(attributes);
+
+ try {
+ for (StorkAttribute current : ConfigurationDBRead
+ .getMOAIDConfiguration().getAuthComponentGeneral()
+ .getForeignIdentities().getSTORK().getAttributes())
+ attributes.add(new AttributeHelper(current));
+
+
+ } catch (NullPointerException e) {
+
+ }
+ getStorkOA().setHelperAttributes(attributes);
+
} catch (BasicActionException e) {
return Constants.STRUTS_ERROR;
diff --git a/id/ConfigWebTool/src/main/java/at/gv/egovernment/moa/id/configuration/validation/oa/OAPVP2ConfigValidation.java b/id/ConfigWebTool/src/main/java/at/gv/egovernment/moa/id/configuration/validation/oa/OAPVP2ConfigValidation.java
index 345d25cda..40e243d0b 100644
--- a/id/ConfigWebTool/src/main/java/at/gv/egovernment/moa/id/configuration/validation/oa/OAPVP2ConfigValidation.java
+++ b/id/ConfigWebTool/src/main/java/at/gv/egovernment/moa/id/configuration/validation/oa/OAPVP2ConfigValidation.java
@@ -121,10 +121,10 @@ public class OAPVP2ConfigValidation {
protoSocketFactory);
} catch (MOAHttpProtocolSocketFactoryException e) {
- log.warn("MOA SSL-TrustStore can not initialized. Use default Java TrustStore.");
+ log.warn("MOA SSL-TrustStore can not initialized. Use default Java TrustStore.", e);
} catch (ConfigurationException e) {
- log.info("No MOA specific SSL-TrustStore configured. Use default Java TrustStore.");
+ log.info("No MOA specific SSL-TrustStore configured. Use default Java TrustStore.", e);
}