diff options
| author | Thomas Lenz <tlenz@iaik.tugraz.at> | 2014-09-17 11:58:22 +0200 |
|---|---|---|
| committer | Thomas Lenz <tlenz@iaik.tugraz.at> | 2014-09-17 11:58:22 +0200 |
| commit | 00677e1478fa2a33ec22b06b5c5180b965e2c9f2 (patch) | |
| tree | ddff7065b29478d61df1809ac60e05bbd2eea5a1 /id/ConfigWebTool/src/main/java/at | |
| parent | 617352b25d5a5e315b55835a2f822f25836b8a38 (diff) | |
| parent | 42fbebacc80981b145464287f1bbbd8441713652 (diff) | |
| download | moa-id-spss-00677e1478fa2a33ec22b06b5c5180b965e2c9f2.tar.gz moa-id-spss-00677e1478fa2a33ec22b06b5c5180b965e2c9f2.tar.bz2 moa-id-spss-00677e1478fa2a33ec22b06b5c5180b965e2c9f2.zip | |
Merge branch 'moa-2.1-Snapshot'
Diffstat (limited to 'id/ConfigWebTool/src/main/java/at')
2 files changed, 14 insertions, 9 deletions
diff --git a/id/ConfigWebTool/src/main/java/at/gv/egovernment/moa/id/configuration/data/GeneralMOAIDConfig.java b/id/ConfigWebTool/src/main/java/at/gv/egovernment/moa/id/configuration/data/GeneralMOAIDConfig.java index f29780f05..def880da8 100644 --- a/id/ConfigWebTool/src/main/java/at/gv/egovernment/moa/id/configuration/data/GeneralMOAIDConfig.java +++ b/id/ConfigWebTool/src/main/java/at/gv/egovernment/moa/id/configuration/data/GeneralMOAIDConfig.java @@ -102,7 +102,7 @@ public class GeneralMOAIDConfig { private List<File> fileUpload = null; private List<String> fileUploadContentType; - private List<String> fileUploadFileName; + private List<String> fileUploadFileName = new ArrayList<String>(); private Map<String, byte[]> secLayerTransformation = null; private String ssoTarget = null; @@ -271,8 +271,6 @@ public class GeneralMOAIDConfig { SecurityLayer seclayer = auth.getSecurityLayer(); if (seclayer != null) { List<TransformsInfoType> list = seclayer.getTransformsInfo(); - - fileUploadFileName = new ArrayList<String>(); for (TransformsInfoType el : list) { fileUploadFileName.add(el.getFilename()); @@ -335,10 +333,7 @@ public class GeneralMOAIDConfig { SLRequestTemplateOnline = slreq.getOnlineBKU(); } - } else { - fileUploadFileName = new ArrayList<String>(); - - } + } } /** diff --git a/id/ConfigWebTool/src/main/java/at/gv/egovernment/moa/id/configuration/struts/action/EditGeneralConfigAction.java b/id/ConfigWebTool/src/main/java/at/gv/egovernment/moa/id/configuration/struts/action/EditGeneralConfigAction.java index 32ffd2ba3..7f609d95e 100644 --- a/id/ConfigWebTool/src/main/java/at/gv/egovernment/moa/id/configuration/struts/action/EditGeneralConfigAction.java +++ b/id/ConfigWebTool/src/main/java/at/gv/egovernment/moa/id/configuration/struts/action/EditGeneralConfigAction.java @@ -594,8 +594,18 @@ public class EditGeneralConfigAction extends BasicAction { dbmoasp.setVerifyAuthBlock(moaauth); } moaauth.setTrustProfileID(moaconfig.getMoaspssAuthTrustProfile()); - - moaauth.getVerifyTransformsInfoProfileID().set(0, moaconfig.getAuthTransformList().get(0)); + + if (moaauth.getVerifyTransformsInfoProfileID() != null && + moaauth.getVerifyTransformsInfoProfileID().size() > 0) + moaauth.getVerifyTransformsInfoProfileID().set(0, moaconfig.getAuthTransformList().get(0)); + + else { + if (moaauth.getVerifyTransformsInfoProfileID() == null) { + moaauth.setVerifyTransformsInfoProfileID(new ArrayList<String>()); + + } + moaauth.getVerifyTransformsInfoProfileID().add(moaconfig.getAuthTransformList().get(0)); + } SecurityLayer seclayertrans = dbauth.getSecurityLayer(); if (seclayertrans == null) { |