Re: FYI: Patch: gnu.java.net.protocol.jar.Handler

[Guilhem Lavaux <guilhem at kaffe dot org>]

Michael Koch wrote:

> On Sat, Dec 20, 2003 at 10:28:19AM +0100, Guilhem Lavaux wrote:
>
>  
>
> > Oh, yeah. Apparently someone merged it into 
> > gnu/testlet/java/net/newURL.java.
> >    
>
> After applying all your patches you sent I have rerun Mauve I get still
> one failure (three others are fixed):
>
> FAIL: gnu.testlet.java.net.URL.newURL: http://www.kaffe.org + foo/bar =
> http://www.kaffe.org/foo/bar (number 1)
>
> Do you have a little patch at hand to fix this too ?
>  

Hmmm.... in URLStreamHandler.java (kaffe's CVS) I've also modified 
something concerning spec. This should be related: if the context URL 
hasn't any attached file context we should prepend '/' to the relative 
file spec.

Guilhem.
--- /home/guilhem/ext2/PROJECTS/classpath/java/net/URLStreamHandler.java	2003-11-27 19:59:02.000000000 +0100
+++ java/net/URLStreamHandler.java	2003-12-20 12:51:13.000000000 +0100
@@ -180,12 +180,20 @@
     else if (host == null) 
       host = "";
 
-    if (file == null || file.length() == 0
-	|| (start < end && spec.charAt(start) == '/')) 
+    if (file == null || file.length() == 0)
       {
 	// No file context available; just spec for file.
-	// Or this is an absolute path name; ignore any file context.
-	file = spec.substring(start, end);
+	// First check that spec is absolute. If it's not the case
+	// prepend a '/'.
+	file = spec.substring (start, end);
+	ref = null;
+	if (start < end && spec.charAt(start) != '/')
+	  file = "/" + file;
+      }
+    else if (start < end && spec.charAt(start) == '/') 
+      {
+	// This is an absolute path name; ignore any file context.
+	file = spec.substring (start, end);
 	ref = null;
       } 
     else if (start < end)

Attachment: pgp00000.pgp
Description: PGP signature