You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@tuscany.apache.org by jb...@apache.org on 2007/02/12 06:56:04 UTC

svn commit: r506301 - /incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/loader/ComponentLoader.java

Author: jboynes
Date: Sun Feb 11 21:56:03 2007
New Revision: 506301

URL: http://svn.apache.org/viewvc?view=rev&rev=506301
Log:
handle URIs ending in '/'

Modified:
    incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/loader/ComponentLoader.java

Modified: incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/loader/ComponentLoader.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/loader/ComponentLoader.java?view=diff&rev=506301&r1=506300&r2=506301
==============================================================================
--- incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/loader/ComponentLoader.java (original)
+++ incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/loader/ComponentLoader.java Sun Feb 11 21:56:03 2007
@@ -251,21 +251,26 @@
         }
         URI targetURI;
         QualifiedName qName = new QualifiedName(target);
-        StringBuilder buf = new StringBuilder();
         List<String> names = deploymentContext.getPathNames();
-        for (int i = 0; i < names.size() - 1; i++) {
-            buf.append("/");
-        }
-        if (names.size() > 0) {
+        String path;
+        if (names.size() == 0) {
+            path = "/";
+        } else {
+            StringBuilder buf = new StringBuilder();
+            for (int i = 0; i < names.size() - 1; i++) {
+                buf.append(names.get(i)).append("/");
+            }
             buf.append(names.get(names.size() - 1));
+            if (buf.charAt(buf.length()-1) != '/') {
+                buf.append('/');
+            }
+            path = buf.toString();
         }
-        String path = buf.toString();
         try {
-            if (qName.getPortName() == null) {
-                targetURI = new URI(path + "/" + qName.getPartName());
-            } else {
-                targetURI =
-                    new URI(path + "/" + qName.getPartName() + "#" + qName.getPortName());
+            URI uri = new URI(path);
+            targetURI = uri.resolve(qName.getPartName());
+            if (qName.getPortName() != null) {
+                targetURI = targetURI.resolve('#' + qName.getPortName());
             }
         } catch (URISyntaxException e) {
             throw new InvalidReferenceException("Illegal URI", name, e);



---------------------------------------------------------------------
To unsubscribe, e-mail: tuscany-commits-unsubscribe@ws.apache.org
For additional commands, e-mail: tuscany-commits-help@ws.apache.org