diff options
| author | Thomas Lenz <tlenz@iaik.tugraz.at> | 2014-05-28 10:13:07 +0200 |
|---|---|---|
| committer | Thomas Lenz <tlenz@iaik.tugraz.at> | 2014-05-28 10:13:07 +0200 |
| commit | 272ed582f22be749945e86eaca5592cc66e153d9 (patch) | |
| tree | 9aaa65aed2b147f5aa3ebddd8ee959ae51bb9848 /id/ConfigWebTool/src | |
| parent | 352a061434c121bb438b01829131aaa85378fc26 (diff) | |
| download | moa-id-spss-272ed582f22be749945e86eaca5592cc66e153d9.tar.gz moa-id-spss-272ed582f22be749945e86eaca5592cc66e153d9.tar.bz2 moa-id-spss-272ed582f22be749945e86eaca5592cc66e153d9.zip | |
bugfix interfederation configuration
Diffstat (limited to 'id/ConfigWebTool/src')
| -rw-r--r-- | id/ConfigWebTool/src/main/java/at/gv/egovernment/moa/id/configuration/struts/action/InterfederationIDPAction.java | 16 |
1 files changed, 9 insertions, 7 deletions
diff --git a/id/ConfigWebTool/src/main/java/at/gv/egovernment/moa/id/configuration/struts/action/InterfederationIDPAction.java b/id/ConfigWebTool/src/main/java/at/gv/egovernment/moa/id/configuration/struts/action/InterfederationIDPAction.java index 46c3ea8f5..dfb27673a 100644 --- a/id/ConfigWebTool/src/main/java/at/gv/egovernment/moa/id/configuration/struts/action/InterfederationIDPAction.java +++ b/id/ConfigWebTool/src/main/java/at/gv/egovernment/moa/id/configuration/struts/action/InterfederationIDPAction.java @@ -225,14 +225,16 @@ public class InterfederationIDPAction extends BasicOAAction { errors.addAll(form.validate(getGeneralOA(), authUser, request)); - boolean publicServiceAllowed = ValidationHelper.isPublicServiceAllowed(getPvp2OA().getMetaDataURL()); - if (!publicServiceAllowed && !getGeneralOA().isBusinessService()) { - log.info("Metadata URL " + getPvp2OA().getMetaDataURL() + " does not allow PublicService."); - errors.add(LanguageHelper.getErrorString("validation.interfederation.moaidp.metadataurl.publicservice", - new Object[] {getPvp2OA().getMetaDataURL()}, request )); - getGeneralOA().setBusinessService(true); + if (getPvp2OA() != null) { + boolean publicServiceAllowed = ValidationHelper.isPublicServiceAllowed(getPvp2OA().getMetaDataURL()); + if (!publicServiceAllowed && !getGeneralOA().isBusinessService()) { + log.info("Metadata URL " + getPvp2OA().getMetaDataURL() + " does not allow PublicService."); + errors.add(LanguageHelper.getErrorString("validation.interfederation.moaidp.metadataurl.publicservice", + new Object[] {getPvp2OA().getMetaDataURL()}, request )); + getGeneralOA().setBusinessService(true); - } + } + } if (errors.size() > 0) { |