aboutsummaryrefslogtreecommitdiff
path: root/id/ConfigWebTool/src/main/java/at/gv/egovernment
diff options
context:
space:
mode:
authorThomas Lenz <tlenz@iaik.tugraz.at>2014-09-17 11:57:01 +0200
committerThomas Lenz <tlenz@iaik.tugraz.at>2014-09-17 11:57:01 +0200
commit42fbebacc80981b145464287f1bbbd8441713652 (patch)
treed7942772c5cc3ff5afe7daf99dafdc4728fc55c1 /id/ConfigWebTool/src/main/java/at/gv/egovernment
parentd18b20e6f597768206315e52eb798b32a27ce1e5 (diff)
downloadmoa-id-spss-42fbebacc80981b145464287f1bbbd8441713652.tar.gz
moa-id-spss-42fbebacc80981b145464287f1bbbd8441713652.tar.bz2
moa-id-spss-42fbebacc80981b145464287f1bbbd8441713652.zip
update configuration tool
Diffstat (limited to 'id/ConfigWebTool/src/main/java/at/gv/egovernment')
-rw-r--r--id/ConfigWebTool/src/main/java/at/gv/egovernment/moa/id/configuration/data/GeneralMOAIDConfig.java9
-rw-r--r--id/ConfigWebTool/src/main/java/at/gv/egovernment/moa/id/configuration/struts/action/EditGeneralConfigAction.java14
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) {