diff options
Diffstat (limited to 'id/ConfigWebTool')
-rw-r--r-- | id/ConfigWebTool/src/main/java/at/gv/egovernment/moa/id/configuration/struts/action/EditOAAction.java | 14 |
1 files changed, 12 insertions, 2 deletions
diff --git a/id/ConfigWebTool/src/main/java/at/gv/egovernment/moa/id/configuration/struts/action/EditOAAction.java b/id/ConfigWebTool/src/main/java/at/gv/egovernment/moa/id/configuration/struts/action/EditOAAction.java index cc2cf3bf0..452c5580d 100644 --- a/id/ConfigWebTool/src/main/java/at/gv/egovernment/moa/id/configuration/struts/action/EditOAAction.java +++ b/id/ConfigWebTool/src/main/java/at/gv/egovernment/moa/id/configuration/struts/action/EditOAAction.java @@ -943,10 +943,12 @@ public class EditOAAction extends BasicAction { authoa.setOAPVP2(pvp2); } - pvp2.setMetadataURL(pvp2OA.getMetaDataURL()); try { - if (pvp2OA.getFileUpload() != null) pvp2.setCertificate(pvp2OA.getCertificate()); + if (pvp2OA.getFileUpload() != null) { + pvp2.setCertificate(pvp2OA.getCertificate()); + pvp2OA.setReLoad(true); + } } catch (CertificateException e) { log.info("Uploaded Certificate can not be found", e); @@ -956,6 +958,14 @@ public class EditOAAction extends BasicAction { return LanguageHelper.getErrorString("validation.pvp2.certificate.format", request); } + if (pvp2OA.getMetaDataURL() != null && + !pvp2OA.getMetaDataURL().equals(pvp2.getMetadataURL())) + pvp2OA.setReLoad(true); + pvp2.setMetadataURL(pvp2OA.getMetaDataURL()); + + if (pvp2OA.isReLoad()) + pvp2.setUpdateRequiredItem(new Date()); + OASAML1 saml1 = authoa.getOASAML1(); if (saml1 == null) { saml1 = new OASAML1(); |