diff options
author | gregor <gregor@d688527b-c9ab-4aba-bd8d-4036d912da1d> | 2005-07-18 07:19:15 +0000 |
---|---|---|
committer | gregor <gregor@d688527b-c9ab-4aba-bd8d-4036d912da1d> | 2005-07-18 07:19:15 +0000 |
commit | ac3296bb205048da5a1e4494dd4956f4312cf948 (patch) | |
tree | 4bc1805ab329c8724a956a4c10a1ae564efdce0b /spss.server/src/at/gv/egovernment/moa/spss/server/config | |
parent | c09f1913c1ac92c76b1baaba705d09c52eeec7db (diff) | |
download | moa-id-spss-ac3296bb205048da5a1e4494dd4956f4312cf948.tar.gz moa-id-spss-ac3296bb205048da5a1e4494dd4956f4312cf948.tar.bz2 moa-id-spss-ac3296bb205048da5a1e4494dd4956f4312cf948.zip |
Fix für Bug 267 getestet.tags/Build-ID-1.2.0.D10
git-svn-id: https://joinup.ec.europa.eu/svn/moa-idspss/trunk@382 d688527b-c9ab-4aba-bd8d-4036d912da1d
Diffstat (limited to 'spss.server/src/at/gv/egovernment/moa/spss/server/config')
-rw-r--r-- | spss.server/src/at/gv/egovernment/moa/spss/server/config/ConfigurationPartsBuilder.java | 25 |
1 files changed, 11 insertions, 14 deletions
diff --git a/spss.server/src/at/gv/egovernment/moa/spss/server/config/ConfigurationPartsBuilder.java b/spss.server/src/at/gv/egovernment/moa/spss/server/config/ConfigurationPartsBuilder.java index 33e9daca1..96a90980d 100644 --- a/spss.server/src/at/gv/egovernment/moa/spss/server/config/ConfigurationPartsBuilder.java +++ b/spss.server/src/at/gv/egovernment/moa/spss/server/config/ConfigurationPartsBuilder.java @@ -829,8 +829,6 @@ public class ConfigurationPartsBuilder { String uriStr = profileElem.getAttribute("uri"); String signerCertsUriStr = profileElem.getAttribute("signerCertsUri"); - boolean createTrustProfile = true; - URI uri = null; try { @@ -841,23 +839,23 @@ public class ConfigurationPartsBuilder { } catch (URIException e) { warn("config.14", new Object[] { "uri", id, uriStr }, e); - createTrustProfile = false; + continue; } catch (MalformedURLException e) { warn("config.15", new Object[] {id}, e); - createTrustProfile = false; + continue; } File profileDir = new File(uri.getPath()); if (!profileDir.exists() || !profileDir.isDirectory()) { warn("config.27", new Object[] { "uri", id }); - createTrustProfile = false; + continue; } if (trustProfiles.containsKey(id)) { warn("config.04", new Object[] { "TrustProfile", id }); - createTrustProfile = false; + continue; } URI signerCertsUri = null; @@ -866,28 +864,27 @@ public class ConfigurationPartsBuilder { try { signerCertsUri = new URI(signerCertsUriStr); - if (!signerCertsUri.isAbsolute()) uri = new URI(configRoot.toURL() + signerCertsUriStr); + if (!signerCertsUri.isAbsolute()) signerCertsUri = new URI(configRoot.toURL() + signerCertsUriStr); File signerCertsDir = new File(signerCertsUri.getPath()); if (!signerCertsDir.exists() || !signerCertsDir.isDirectory()) { warn("config.27", new Object[] { "signerCertsUri", id }); - createTrustProfile = false; + continue; } } catch (URIException e) { warn("config.14", new Object[] { "signerCertsUri", id, uriStr }, e); - createTrustProfile = false; + continue; } catch (MalformedURLException e) { warn("config.15", new Object[] {id}, e); - createTrustProfile = false; + continue; } } - if (createTrustProfile) { - TrustProfile profile = new TrustProfile(id, uri.toString(), signerCertsUri.toString()); - trustProfiles.put(id, profile); - } + signerCertsUriStr = (signerCertsUri != null) ? signerCertsUri.toString() : null; + TrustProfile profile = new TrustProfile(id, uri.toString(), signerCertsUriStr); + trustProfiles.put(id, profile); } return trustProfiles; |