2008-01-21 Luciano Chavez <lnx1138@us.ibm.com>

[pf3gnuchains/gcc-fork.git] / libjava / classpath / java / net / URI.java

diff --git a/libjava/classpath/java/net/URI.java b/libjava/classpath/java/net/URI.java
index 689843c..4bf4db9 100644 (file)
--- a/libjava/classpath/java/net/URI.java
+++ b/libjava/classpath/java/net/URI.java
@@ -1,5 +1,5 @@
 /* URI.java -- An URI class
-   Copyright (C) 2002, 2004, 2005, 2006  Free Software Foundation, Inc.
+   Copyright (C) 2002, 2004, 2005, 2006, 2008  Free Software Foundation, Inc.
 
 This file is part of GNU Classpath.
 
@@ -693,7 +693,7 @@ public final class URI
            
            String portStr = getURIGroup(matcher, AUTHORITY_PORT_GROUP);
            
-           if (portStr != null)
+           if (portStr != null && ! portStr.isEmpty())
              try
                {
                  port = Integer.parseInt(portStr);
@@ -968,12 +968,18 @@ public final class URI
       return uri;
     if (rawAuthority != null && !(rawAuthority.equals(uri.getRawAuthority())))
       return uri;
-    if (!(uri.getRawPath().startsWith(rawPath)))
-      return uri;
+    String basePath = rawPath;
+    if (!(uri.getRawPath().equals(rawPath)))
+      {
+       if (!(basePath.endsWith("/")))
+         basePath = basePath.concat("/");
+       if (!(uri.getRawPath().startsWith(basePath)))
+         return uri;
+      }
     try
       {
        return new URI(null, null, 
-                      uri.getRawPath().substring(rawPath.length()),
+                      uri.getRawPath().substring(basePath.length()),
                       uri.getRawQuery(), uri.getRawFragment());
       }
     catch (URISyntaxException e)