aboutsummaryrefslogtreecommitdiff
path: root/id
diff options
context:
space:
mode:
authorThomas Lenz <thomas.lenz@egiz.gv.at>2014-05-20 08:17:56 +0200
committerThomas Lenz <thomas.lenz@egiz.gv.at>2014-05-20 08:17:56 +0200
commit34be99015cbc990af2206f354dbffcacd69ba1c3 (patch)
tree4629dc884805590b42719091383e03cc84517e69 /id
parent5bc23bcbeb8b82eec3eabce0c582db8fb4a3c64a (diff)
downloadmoa-id-spss-34be99015cbc990af2206f354dbffcacd69ba1c3.tar.gz
moa-id-spss-34be99015cbc990af2206f354dbffcacd69ba1c3.tar.bz2
moa-id-spss-34be99015cbc990af2206f354dbffcacd69ba1c3.zip
Signed-off-by: Thomas Lenz <thomas.lenz@egiz.gv.at>
Fix STORK NullPointerException
Diffstat (limited to 'id')
-rw-r--r--id/ConfigWebTool/src/main/java/at/gv/egovernment/moa/id/configuration/data/oa/OASTORKConfig.java9
-rw-r--r--id/server/data/deploy/conf/moa-id/log4j.properties4
-rw-r--r--id/server/idserverlib/pom.xml6
3 files changed, 15 insertions, 4 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 f5c92fec9..be5b2200b 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
@@ -62,8 +62,13 @@ public class OASTORKConfig implements IOnlineApplicationData{
public OASTORKConfig() {
// fetch available citizen countries
citizenCountries = new ArrayList<String>();
- for(CPEPS current : ConfigurationDBRead.getMOAIDConfiguration().getAuthComponentGeneral().getForeignIdentities().getSTORK().getCPEPS()) {
- citizenCountries.add(current.getCountryCode());
+ try {
+ for(CPEPS current : ConfigurationDBRead.getMOAIDConfiguration().getAuthComponentGeneral().getForeignIdentities().getSTORK().getCPEPS()) {
+ citizenCountries.add(current.getCountryCode());
+ }
+
+ }catch (NullPointerException e) {
+
}
}
diff --git a/id/server/data/deploy/conf/moa-id/log4j.properties b/id/server/data/deploy/conf/moa-id/log4j.properties
index 310b58a3d..c7dece5c5 100644
--- a/id/server/data/deploy/conf/moa-id/log4j.properties
+++ b/id/server/data/deploy/conf/moa-id/log4j.properties
@@ -2,11 +2,11 @@
org.apache.commons.logging.LogFactory=org.apache.commons.logging.impl.Log4jFactory
# define log4j root loggers
-log4j.rootLogger=info, stdout, R
+log4j.rootLogger=info, stdout
log4j.logger.at.gv.egovernment.moa=info
log4j.logger.at.gv.egovernment.moa.spss=info
log4j.logger.iaik.server=info
-log4j.logger.at.gv.egovernment.moa.id=info
+log4j.logger.at.gv.egovernment.moa.id=info,R
log4j.logger.at.gv.egovernment.moa.id.proxy=info
log4j.logger.eu.stork=info
log4j.logger.org.hibernate=warn
diff --git a/id/server/idserverlib/pom.xml b/id/server/idserverlib/pom.xml
index f1518951f..687c8843e 100644
--- a/id/server/idserverlib/pom.xml
+++ b/id/server/idserverlib/pom.xml
@@ -238,6 +238,12 @@
<groupId>com.googlecode.jsontoken</groupId>
<artifactId>jsontoken</artifactId>
<version>1.1</version>
+ <exclusions>
+ <exclusion>
+ <groupId>javax.servlet</groupId>
+ <artifactId>servlet-api</artifactId>
+ </exclusion>
+ </exclusions>
</dependency>
<dependency>