aboutsummaryrefslogtreecommitdiff
path: root/id/server/moa-id-commons/src/main
diff options
context:
space:
mode:
authorThomas Lenz <thomas.lenz@egiz.gv.at>2016-11-03 15:07:59 +0100
committerThomas Lenz <thomas.lenz@egiz.gv.at>2016-11-03 15:07:59 +0100
commit5a9ebb9a13299cf8cb5360bfd9de1860e257afc1 (patch)
tree558cb7e26288cca90b3dc7fbbd8f3214b0d978cd /id/server/moa-id-commons/src/main
parent0f8fc8b58e7e39861c34caa8574fac379b05e9ca (diff)
downloadmoa-id-spss-5a9ebb9a13299cf8cb5360bfd9de1860e257afc1.tar.gz
moa-id-spss-5a9ebb9a13299cf8cb5360bfd9de1860e257afc1.tar.bz2
moa-id-spss-5a9ebb9a13299cf8cb5360bfd9de1860e257afc1.zip
fix cherry-pick problem in case of moa-id 3.2.x config already exists
Diffstat (limited to 'id/server/moa-id-commons/src/main')
-rw-r--r--id/server/moa-id-commons/src/main/java/at/gv/egovernment/moa/id/commons/config/ConfigurationMigrationUtils.java7
1 files changed, 6 insertions, 1 deletions
diff --git a/id/server/moa-id-commons/src/main/java/at/gv/egovernment/moa/id/commons/config/ConfigurationMigrationUtils.java b/id/server/moa-id-commons/src/main/java/at/gv/egovernment/moa/id/commons/config/ConfigurationMigrationUtils.java
index 6099760e0..d80856c1c 100644
--- a/id/server/moa-id-commons/src/main/java/at/gv/egovernment/moa/id/commons/config/ConfigurationMigrationUtils.java
+++ b/id/server/moa-id-commons/src/main/java/at/gv/egovernment/moa/id/commons/config/ConfigurationMigrationUtils.java
@@ -970,7 +970,12 @@ public class ConfigurationMigrationUtils {
// transfer the incoming data to the database model
stork.setStorkLogonEnabled(Boolean.parseBoolean(oa.get(MOAIDConfigurationConstants.SERVICE_AUTH_STORK_ENABLED)));
if (MiscUtil.isNotEmpty(oa.get(MOAIDConfigurationConstants.SERVICE_AUTH_STORK_MINQAALEVEL)))
- stork.setQaa(Integer.valueOf(oa.get(MOAIDConfigurationConstants.SERVICE_AUTH_STORK_MINQAALEVEL)));
+ try {
+ stork.setQaa(Integer.valueOf(oa.get(MOAIDConfigurationConstants.SERVICE_AUTH_STORK_MINQAALEVEL)));
+ } catch (NumberFormatException e) {
+ Logger.info("Downgraded OA config found -> change eIDAS LoA to STORK QAA");
+ stork.setQaa(4);
+ }
if (MiscUtil.isNotEmpty(oa.get(MOAIDConfigurationConstants.PREFIX_MOAID_SERVICES))
&& oa.get(MOAIDConfigurationConstants.PREFIX_MOAID_SERVICES).equals(MOAIDConfigurationConstants.PREFIX_VIDP))