diff options
| author | Thomas Lenz <tlenz@iaik.tugraz.at> | 2014-05-07 10:46:51 +0200 |
|---|---|---|
| committer | Thomas Lenz <tlenz@iaik.tugraz.at> | 2014-05-07 10:46:51 +0200 |
| commit | b5250268a67a571d0cd5563b8820c88c2c4e7cca (patch) | |
| tree | 5ecc6e935ed01d67c4d9da32385efca055c0fb0b /id/ConfigWebTool | |
| parent | 976eb0849f4cef5681b7f3b2f1329f528254cad7 (diff) | |
| download | moa-id-spss-b5250268a67a571d0cd5563b8820c88c2c4e7cca.tar.gz moa-id-spss-b5250268a67a571d0cd5563b8820c88c2c4e7cca.tar.bz2 moa-id-spss-b5250268a67a571d0cd5563b8820c88c2c4e7cca.zip | |
solve merge problem
Diffstat (limited to 'id/ConfigWebTool')
| -rw-r--r-- | id/ConfigWebTool/src/main/java/at/gv/egovernment/moa/id/configuration/data/oa/OAAuthenticationData.java | 18 |
1 files changed, 16 insertions, 2 deletions
diff --git a/id/ConfigWebTool/src/main/java/at/gv/egovernment/moa/id/configuration/data/oa/OAAuthenticationData.java b/id/ConfigWebTool/src/main/java/at/gv/egovernment/moa/id/configuration/data/oa/OAAuthenticationData.java index ee2f46eb9..cb60a21a0 100644 --- a/id/ConfigWebTool/src/main/java/at/gv/egovernment/moa/id/configuration/data/oa/OAAuthenticationData.java +++ b/id/ConfigWebTool/src/main/java/at/gv/egovernment/moa/id/configuration/data/oa/OAAuthenticationData.java @@ -277,10 +277,24 @@ public class OAAuthenticationData implements IOnlineApplicationData { Mandates mandates = new Mandates(); if (isUseMandates()) { - mandates.setProfiles(getMandateProfiles()); + + String[] profileList = getMandateProfiles().split(","); + + List<String> dbProfiles = mandates.getProfileName(); + if (dbProfiles == null) { + dbProfiles = new ArrayList<String>(); + mandates.setProfileName(dbProfiles); + + } + + for (String el: profileList) + dbProfiles.add(el.trim()); + + mandates.setProfiles(null); } else { - mandates.setProfiles(new String()); + mandates.setProfiles(null); + mandates.getProfileName().clear(); } authoa.setMandates(mandates); |