diff options
2 files changed, 11 insertions, 2 deletions
diff --git a/branches/sca-java-1.x/modules/contribution-impl/src/main/java/org/apache/tuscany/sca/contribution/processor/impl/FolderContributionProcessor.java b/branches/sca-java-1.x/modules/contribution-impl/src/main/java/org/apache/tuscany/sca/contribution/processor/impl/FolderContributionProcessor.java index ab056e3214..9bd4d23680 100644 --- a/branches/sca-java-1.x/modules/contribution-impl/src/main/java/org/apache/tuscany/sca/contribution/processor/impl/FolderContributionProcessor.java +++ b/branches/sca-java-1.x/modules/contribution-impl/src/main/java/org/apache/tuscany/sca/contribution/processor/impl/FolderContributionProcessor.java @@ -89,7 +89,11 @@ public class FolderContributionProcessor implements PackageProcessor { if (uri.endsWith("/")) { uri = uri.substring(0, uri.length() - 1); } - fileList.add(URI.create(uri)); + try { + fileList.add(new URI(null, uri, null)); + } catch (URISyntaxException e) { + throw new IllegalArgumentException("Invalid artifact uri:" + uri); + } // Allow privileged access to list files. Requires FilePermission in security // policy. diff --git a/branches/sca-java-1.x/modules/node-impl/src/main/java/org/apache/tuscany/sca/node/impl/NodeImpl.java b/branches/sca-java-1.x/modules/node-impl/src/main/java/org/apache/tuscany/sca/node/impl/NodeImpl.java index b0e5352d51..3c13804685 100644 --- a/branches/sca-java-1.x/modules/node-impl/src/main/java/org/apache/tuscany/sca/node/impl/NodeImpl.java +++ b/branches/sca-java-1.x/modules/node-impl/src/main/java/org/apache/tuscany/sca/node/impl/NodeImpl.java @@ -177,7 +177,12 @@ public class NodeImpl implements SCANode, SCAClient { if (compositeURI != null) { //URI uri = URI.create(compositeURI); - URI uri = createURI(compositeURI); + URI uri; + try { + uri = new URI(null, compositeURI, null); + } catch (URISyntaxException e) { + throw new IllegalArgumentException("Invalid Composite URI: " + compositeURI, e); + } if (uri.isAbsolute()) { throw new IllegalArgumentException("Composite URI must be a resource name: " + compositeURI); |