diff options
| author | Thomas Lenz <tlenz@iaik.tugraz.at> | 2016-04-07 16:23:39 +0200 |
|---|---|---|
| committer | Thomas Lenz <tlenz@iaik.tugraz.at> | 2016-04-07 16:23:39 +0200 |
| commit | 1b8eb1ee8f1359e29688cfcfc54446b2d34e0c1f (patch) | |
| tree | a25377c3e4330f81e6d64ddebd7ddbd8a315e8b7 | |
| parent | 581d87d939820b9e74130279692f2825baff6594 (diff) | |
| download | moa-id-spss-1b8eb1ee8f1359e29688cfcfc54446b2d34e0c1f.tar.gz moa-id-spss-1b8eb1ee8f1359e29688cfcfc54446b2d34e0c1f.tar.bz2 moa-id-spss-1b8eb1ee8f1359e29688cfcfc54446b2d34e0c1f.zip | |
fix some STORK configuration storage problem
| -rw-r--r-- | id/ConfigWebTool/src/main/java/at/gv/egovernment/moa/id/configuration/struts/action/EditGeneralConfigAction.java | 14 |
1 files changed, 4 insertions, 10 deletions
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 d12c1342c..40e9b1a90 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 @@ -556,12 +556,9 @@ public class EditGeneralConfigAction extends BasicAction { stork.setQualityAuthenticationAssuranceLevel(storkconfig.getDefaultQaa()); if (storkconfig.getAttributes() != null) { - List<StorkAttribute> dbStorkAttr = stork.getAttributes(); - if (dbStorkAttr == null) { - dbStorkAttr = new ArrayList<StorkAttribute>(); - stork.setAttributes(dbStorkAttr); + List<StorkAttribute> dbStorkAttr = new ArrayList<StorkAttribute>(); + stork.setAttributes(dbStorkAttr); - } for (StorkAttribute attr : storkconfig.getAttributes()) { if (attr != null && MiscUtil.isNotEmpty(attr.getName())) @@ -575,11 +572,8 @@ public class EditGeneralConfigAction extends BasicAction { stork.setAttributes((List<StorkAttribute>) (new ArrayList<StorkAttribute>())); if (storkconfig.getCpepslist() != null) { - List<CPEPS> dbStorkCPEPS = stork.getCPEPS(); - if (dbStorkCPEPS == null) { - dbStorkCPEPS = new ArrayList<CPEPS>(); - stork.setCPEPS(dbStorkCPEPS); - } + List<CPEPS> dbStorkCPEPS = new ArrayList<CPEPS>(); + stork.setCPEPS(dbStorkCPEPS); for (CPEPS cpeps : storkconfig.getCpepslist()) { if (cpeps != null && MiscUtil.isNotEmpty(cpeps.getURL()) && |