[kaffe] CVS kaffe (robilad): resynced with GNU Classpath: URL fixlet

[Kaffe CVS]

PatchSet 6416 
Date: 2005/04/24 12:34:27
Author: robilad
Branch: HEAD
Tag: (none) 
Log:
resynced with GNU Classpath: URL fixlet

2005-04-24  Dalibor Topic  <robilad at kaffe.org>

        Resynced with GNU Classpath:

        2005-04-23  Mark Wielaard  <mark at klomp.org>

        * java/net/URL.java (URL(URL,String,URLStreamHandler)): Add spec
        to MalformedURLException.

Members: 
	ChangeLog:1.3944->1.3945 
	libraries/javalib/java/net/URL.java:1.55->1.56 
	test/regression/URLTest.java:1.5->1.6 

Index: kaffe/ChangeLog
diff -u kaffe/ChangeLog:1.3944 kaffe/ChangeLog:1.3945
--- kaffe/ChangeLog:1.3944	Sun Apr 24 10:08:08 2005
+++ kaffe/ChangeLog	Sun Apr 24 12:34:27 2005
@@ -2,6 +2,15 @@
 
 	Resynced with GNU Classpath:
 
+	2005-04-23  Mark Wielaard  <mark at klomp.org>
+
+        * java/net/URL.java (URL(URL,String,URLStreamHandler)): Add spec
+        to MalformedURLException.
+
+2005-04-24  Dalibor Topic  <robilad at kaffe.org>
+
+	Resynced with GNU Classpath:
+
 	2005-04-23  Michael Koch  <konqueror at gmx.de>
 
         * java/net/ServerSocket.java
Index: kaffe/libraries/javalib/java/net/URL.java
diff -u kaffe/libraries/javalib/java/net/URL.java:1.55 kaffe/libraries/javalib/java/net/URL.java:1.56
--- kaffe/libraries/javalib/java/net/URL.java:1.55	Sat Apr 23 10:35:18 2005
+++ kaffe/libraries/javalib/java/net/URL.java	Sun Apr 24 12:34:31 2005
@@ -430,7 +430,8 @@
 	authority = context.authority;
       }
     else // Protocol NOT specified in spec. and no context available.
-      throw new MalformedURLException("Absolute URL required with null context");
+      throw new MalformedURLException("Absolute URL required with null"
+				      + " context: " + spec);
 
     protocol = protocol.trim();
 
Index: kaffe/test/regression/URLTest.java
diff -u kaffe/test/regression/URLTest.java:1.5 kaffe/test/regression/URLTest.java:1.6
--- kaffe/test/regression/URLTest.java:1.5	Sat Dec 27 21:16:02 2003
+++ kaffe/test/regression/URLTest.java	Sun Apr 24 12:34:31 2005
@@ -64,7 +64,7 @@
 	"foo/bar",
 // This testcase is too strict. I use here the message sent by classpath.
 //	"java.net.MalformedURLException: Protocol handler not found: foo/bar"
-	"java.net.MalformedURLException: Absolute URL required with null context"
+	"java.net.MalformedURLException: Absolute URL required with null context: foo/bar"
     ),
 
     new TestCase(
@@ -120,7 +120,7 @@
 	"foo/bar",
 // This testcase is too strict. I use here the message sent by classpath.
 //	"java.net.MalformedURLException: Protocol handler not found: foo/bar"
-	"java.net.MalformedURLException: Absolute URL required with null context"
+	"java.net.MalformedURLException: Absolute URL required with null context: foo/bar"
     ),
 
     new TestCase(
@@ -134,7 +134,7 @@
 	"jar:abc!/eat/me",
 // This testcase is too strict. I use here the message sent by classpath.
 //	"java.net.MalformedURLException: invalid inner URL: Protocol handler not found: abc"
-	"java.net.MalformedURLException: invalid inner URL: Absolute URL required with null context"
+	"java.net.MalformedURLException: invalid inner URL: Absolute URL required with null context: abc"
     ),
 
   };