From 9abe2e29b4cc5e50af73f2371acbb7a6fcf234e3 Mon Sep 17 00:00:00 2001
From: Per Bothner <per@bothner.com>
Date: Fri, 22 Feb 2002 16:15:49 -0800
Subject: URL.java (getPath): New JDK 1.3 method.

	* java/net/URL.java (getPath):  New JDK 1.3 method.

	* java/net/URLStreamHandler.java (parseURL):
	It is wrong to prepend '/' to the file part of a relative url.

	* java/net/URLStreamHandler.java (parseURL):
	Minor optizations - append '/' rather than "/".

	* java/net/URLStreamHandler.java (parseURL):
	Don't canonicalize "xx/.." or "./" URLs - JDK doesn't.
	We probably should canonicalize for a context-relative url, though.
	* java/net/URL.java (sameFile):  Delegate to URLStreamHandler.
	* java/net/URLStreamHandler.java (canonicalizeFilename):  New helper.
	(sameFile):  New method.  Uses canonicalizeFilename.

From-SVN: r49980
---
 libjava/java/net/URL.java | 19 ++++++++-----------
 1 file changed, 8 insertions(+), 11 deletions(-)

(limited to 'libjava/java/net/URL.java')

diff --git a/libjava/java/net/URL.java b/libjava/java/net/URL.java
index 636e6ef..a3e9d78 100644
--- a/libjava/java/net/URL.java
+++ b/libjava/java/net/URL.java
@@ -1,6 +1,6 @@
 // URL.java - A Uniform Resource Locator.
 
-/* Copyright (C) 1999, 2000  Free Software Foundation
+/* Copyright (C) 1999, 2000, 2002  Free Software Foundation
 
    This file is part of libgcj.
 
@@ -219,6 +219,12 @@ public final class URL implements Serializable
     return file;
   }
 
+  public String getPath()
+  {
+    int quest = file.indexOf('?');
+    return quest < 0 ? file : file.substring(0, quest);
+  }
+
   public String getHost()
   {
     return host;
@@ -274,16 +280,7 @@ public final class URL implements Serializable
 
   public boolean sameFile(URL other)
   {
-    // This comparison is very conservative.  It assumes that any
-    // field can be null.
-    return (other != null 
-	    && port == other.port
-	    && ((protocol == null && other.protocol == null)
-		|| (protocol != null && protocol.equals(other.protocol)))
-	    && ((host == null && other.host == null)
-		|| (host != null && host.equals(other.host)))
-	    && ((file == null && other.file == null)
-		|| (file != null && file.equals(other.file))));
+    return handler.sameFile(this, other);
   }
 
   protected void set(String protocol, String host, int port, String file,
-- 
cgit v1.1