aboutsummaryrefslogtreecommitdiff
path: root/id
diff options
context:
space:
mode:
authorThomas Lenz <tlenz@iaik.tugraz.at>2014-04-09 10:48:53 +0200
committerThomas Lenz <tlenz@iaik.tugraz.at>2014-04-09 10:48:53 +0200
commitad657b9d6cba12f9651d6c34b863acb1c3b05137 (patch)
treec01038c7931e253c859858d2c62b407fb3c8e3b0 /id
parenteb153c1e36842485aaebb4afc2d9a616e4695c10 (diff)
downloadmoa-id-spss-ad657b9d6cba12f9651d6c34b863acb1c3b05137.tar.gz
moa-id-spss-ad657b9d6cba12f9651d6c34b863acb1c3b05137.tar.bz2
moa-id-spss-ad657b9d6cba12f9651d6c34b863acb1c3b05137.zip
fix possible NullPointerException
Diffstat (limited to 'id')
-rw-r--r--id/ConfigWebTool/src/main/java/at/gv/egovernment/moa/id/configuration/data/oa/OASTORKConfig.java11
1 files changed, 9 insertions, 2 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 03d2d6d1e..b43e76d53 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
@@ -106,8 +106,15 @@ public class OASTORKConfig {
}
// fetch vidp config
- setVidpEnabled(config.isVidpEnabled());
- setRequireConsent(config.isRequireConsent());
+ if (config.isVidpEnabled() != null)
+ setVidpEnabled(config.isVidpEnabled());
+ else
+ setVidpEnabled(false);
+
+ if (config.isRequireConsent() != null)
+ setRequireConsent(config.isRequireConsent());
+ else
+ setRequireConsent(false);
attributeProviderPlugins = config.getAttributeProviders();
// - if no attribute providers are configured, add a dummy