diff options
Diffstat (limited to 'libjava/classpath')
| -rw-r--r-- | libjava/classpath/ChangeLog | 6 | ||||
| -rw-r--r-- | libjava/classpath/java/net/URI.java | 14 | ||||
| -rw-r--r-- | libjava/classpath/lib/java/net/URI.class | bin | 16397 -> 16505 bytes |
3 files changed, 16 insertions, 4 deletions
diff --git a/libjava/classpath/ChangeLog b/libjava/classpath/ChangeLog index 4086a236cea..fbeb438713c 100644 --- a/libjava/classpath/ChangeLog +++ b/libjava/classpath/ChangeLog @@ -1,3 +1,9 @@ +2008-01-21 Luciano Chavez <lnx1138@us.ibm.com> + + PR libgcj/34369: + * java/net/URI.java (relativize): Check initial segment for + trailing "/". + 2007-12-05 Thomas Fitzsimmons <fitzsim@redhat.com> * gnu/java/awt/peer/gtk/GdkGraphicsEnvironment.java, diff --git a/libjava/classpath/java/net/URI.java b/libjava/classpath/java/net/URI.java index 43b10fc4195..4bf4db9856c 100644 --- 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. @@ -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) diff --git a/libjava/classpath/lib/java/net/URI.class b/libjava/classpath/lib/java/net/URI.class Binary files differindex 760c952f192..be72cf438de 100644 --- a/libjava/classpath/lib/java/net/URI.class +++ b/libjava/classpath/lib/java/net/URI.class |
