From aedbe5c94da87967d8fc3be960c034795bc153aa Mon Sep 17 00:00:00 2001 From: Tom Tromey Date: Mon, 21 Jan 2008 20:09:55 +0000 Subject: 2008-01-21 Luciano Chavez PR libgcj/34369: * java/net/URI.java (relativize): Check initial segment for trailing "/". --- ChangeLog | 6 ++++++ java/net/URI.java | 14 ++++++++++---- 2 files changed, 16 insertions(+), 4 deletions(-) diff --git a/ChangeLog b/ChangeLog index c40808ac6..4f32be94b 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,9 @@ +2008-01-21 Luciano Chavez + + PR libgcj/34369: + * java/net/URI.java (relativize): Check initial segment for + trailing "/". + 2008-01-14 Andrew John Hughes * m4/acinclude.m4: diff --git a/java/net/URI.java b/java/net/URI.java index 43b10fc41..4bf4db985 100644 --- a/java/net/URI.java +++ b/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) -- cgit v1.2.1