diff options
author | lresende <lresende@13f79535-47bb-0310-9956-ffa450edef68> | 2008-10-30 00:14:15 +0000 |
---|---|---|
committer | lresende <lresende@13f79535-47bb-0310-9956-ffa450edef68> | 2008-10-30 00:14:15 +0000 |
commit | 5d2e096f06d6cac9ed6ee18ad1cf716a09adc2b0 (patch) | |
tree | 2260086a44fd2494724820533a4a65dbdc1a381a /branches/sca-java-1.3.3/modules/domain-manager/src/main/java | |
parent | 01d5cda417c43c3220360f57ffd371e5a19279d9 (diff) |
TUSCANY-2629 and TUSCANY-2624 - Enhancments to processor that handles unknown elements
git-svn-id: http://svn.us.apache.org/repos/asf/tuscany@709052 13f79535-47bb-0310-9956-ffa450edef68
Diffstat (limited to 'branches/sca-java-1.3.3/modules/domain-manager/src/main/java')
-rw-r--r-- | branches/sca-java-1.3.3/modules/domain-manager/src/main/java/org/apache/tuscany/sca/domain/manager/impl/DomainManagerUtil.java | 16 |
1 files changed, 14 insertions, 2 deletions
diff --git a/branches/sca-java-1.3.3/modules/domain-manager/src/main/java/org/apache/tuscany/sca/domain/manager/impl/DomainManagerUtil.java b/branches/sca-java-1.3.3/modules/domain-manager/src/main/java/org/apache/tuscany/sca/domain/manager/impl/DomainManagerUtil.java index bd330322e5..fee1efc37a 100644 --- a/branches/sca-java-1.3.3/modules/domain-manager/src/main/java/org/apache/tuscany/sca/domain/manager/impl/DomainManagerUtil.java +++ b/branches/sca-java-1.3.3/modules/domain-manager/src/main/java/org/apache/tuscany/sca/domain/manager/impl/DomainManagerUtil.java @@ -23,6 +23,7 @@ import java.io.File; import java.io.IOException; import java.net.MalformedURLException; import java.net.URI; +import java.net.URISyntaxException; import java.net.URL; import java.net.URLConnection; @@ -124,14 +125,25 @@ public final class DomainManagerUtil { * @throws MalformedURLException */ static URL locationURL(String location) throws MalformedURLException { - URI uri = URI.create(location); - String scheme = uri.getScheme(); + String scheme = null; + URI uri = null; + + IllegalArgumentException uriException = null; + try { + uri = URI.create(location); + scheme = uri.getScheme(); + }catch (java.lang.IllegalArgumentException e) { + uriException = e; + } + if (scheme == null) { File file = new File(location); return file.toURI().toURL(); } else if (scheme.equals("file")) { File file = new File(location.substring(5)); return file.toURI().toURL(); + } else if(uri == null){ + throw uriException; } else { return uri.toURL(); } |