Reported by Roman Kennke <roman@ontographics.com> (bug #9331)

	Reported by Roman Kennke <roman@ontographics.com> (bug #9331)
	* java/net/URLStreamHandler.java (parseURL): When url file part
	doesn't contain a '/' just ignore context.

From-SVN: r84518

diff --git a/libjava/ChangeLog b/libjava/ChangeLog
index 01952d6a5d5ce204e4143861f60771f370b0df0d..c7f5dec47053e491ece2917a55ec822f762a8175 100644 (file)
--- a/libjava/ChangeLog
+++ b/libjava/ChangeLog
@@ -1,3 +1,9 @@
+2004-07-11  Mark Wielaard  <mark@klomp.org>
+
+       Reported by Roman Kennke <roman@ontographics.com> (bug #9331)
+       * java/net/URLStreamHandler.java (parseURL): When url file part
+       doesn't contain a '/' just ignore context.
+
 2004-07-11  Ulrich Weigand  <uweigand@de.ibm.com>
 
        * include/s390-signal.c (SIGNAL_HANDLER): Use SIGINFO-style prototype.

diff --git a/libjava/java/net/URLStreamHandler.java b/libjava/java/net/URLStreamHandler.java
index 5fef7ea909e0db96451dbb2aa01c59848f269930..aca62612f663dab9612cb973822f5d328e0e9578 100644 (file)
--- a/libjava/java/net/URLStreamHandler.java
+++ b/libjava/java/net/URLStreamHandler.java
@@ -208,9 +208,11 @@ public abstract class URLStreamHandler
       {
        // Context is available, but only override it if there is a new file.
        int lastSlash = file.lastIndexOf('/');
-
-       file =
-         file.substring(0, lastSlash) + '/' + spec.substring(start, end);
+       if (lastSlash < 0)
+         file = spec.substring(start, end);
+       else
+         file = (file.substring(0, lastSlash)
+                 + '/' + spec.substring(start, end));
 
        if (url.getProtocol().equals("file"))
          {