diff options
| author | Thomas Lenz <tlenz@iaik.tugraz.at> | 2014-12-04 09:56:03 +0100 |
|---|---|---|
| committer | Thomas Lenz <tlenz@iaik.tugraz.at> | 2014-12-04 09:56:03 +0100 |
| commit | 309f381c1ef98a82a23da42cda99734032b73bf4 (patch) | |
| tree | 8bbbbc9645c7d0341c2edf6ed5138144be72ade7 /id/ConfigWebTool/src/main/java/at | |
| parent | 69cd6c71b77ef6fb454701cfa05b81b323744819 (diff) | |
| download | moa-id-spss-309f381c1ef98a82a23da42cda99734032b73bf4.tar.gz moa-id-spss-309f381c1ef98a82a23da42cda99734032b73bf4.tar.bz2 moa-id-spss-309f381c1ef98a82a23da42cda99734032b73bf4.zip | |
change exception handling for TrustStore configuration
Diffstat (limited to 'id/ConfigWebTool/src/main/java/at')
2 files changed, 5 insertions, 8 deletions
diff --git a/id/ConfigWebTool/src/main/java/at/gv/egovernment/moa/id/configuration/config/ConfigurationProvider.java b/id/ConfigWebTool/src/main/java/at/gv/egovernment/moa/id/configuration/config/ConfigurationProvider.java index 957479b29..e6000319e 100644 --- a/id/ConfigWebTool/src/main/java/at/gv/egovernment/moa/id/configuration/config/ConfigurationProvider.java +++ b/id/ConfigWebTool/src/main/java/at/gv/egovernment/moa/id/configuration/config/ConfigurationProvider.java @@ -437,23 +437,23 @@ public class ConfigurationProvider { return parseVersionFromManifest(); } - public String getCertStoreDirectory() throws CertificateException { + public String getCertStoreDirectory() throws ConfigurationException { String dir = props.getProperty("general.ssl.certstore"); if (MiscUtil.isNotEmpty(dir)) return FileUtils.makeAbsoluteURL(dir, configRootDir); else - throw new CertificateException("No SSLCertStore configured use default JAVA TrustStore."); + throw new ConfigurationException("No SSLCertStore configured use default JAVA TrustStore."); } - public String getTrustStoreDirectory() throws CertificateException { + public String getTrustStoreDirectory() throws ConfigurationException { String dir = props.getProperty("general.ssl.truststore"); if (MiscUtil.isNotEmpty(dir)) return FileUtils.makeAbsoluteURL(dir, configRootDir); else - throw new CertificateException("No SSLTrustStore configured use default JAVA TrustStore."); + throw new ConfigurationException("No SSLTrustStore configured use default JAVA TrustStore."); } diff --git a/id/ConfigWebTool/src/main/java/at/gv/egovernment/moa/id/configuration/validation/oa/OAPVP2ConfigValidation.java b/id/ConfigWebTool/src/main/java/at/gv/egovernment/moa/id/configuration/validation/oa/OAPVP2ConfigValidation.java index 964a10a1b..d122b6bde 100644 --- a/id/ConfigWebTool/src/main/java/at/gv/egovernment/moa/id/configuration/validation/oa/OAPVP2ConfigValidation.java +++ b/id/ConfigWebTool/src/main/java/at/gv/egovernment/moa/id/configuration/validation/oa/OAPVP2ConfigValidation.java @@ -126,10 +126,7 @@ public class OAPVP2ConfigValidation { } catch (ConfigurationException e) { log.info("No MOA specific SSL-TrustStore configured. Use default Java TrustStore.", e); - } catch (CertificateException e) { - log.info("No MOA specific SSL-TrustStore configured. Use default Java TrustStore.", e); - - } + } httpProvider = new HTTPMetadataProvider(timer, httpClient, form.getMetaDataURL()); |