[multiple changes]

2004-09-24  Guilhem Lavaux  <guilhem@kaffe.org>

	* java/net/URL.java (URL): Delete whitespaces in the protocol string.

2004-09-24  Jeroen Frijters  <jeroen@frijters.net>

	* java/net/URL.java (URL(String,String,int,String,URLStreamHandler):
	Don't set authority if host isn't specified.

From-SVN: r88015

diff --git a/libjava/ChangeLog b/libjava/ChangeLog
index 1a43194cd23bbe2eaf2d5b504f5458c014067c18..234a0f3bda38cc6cd97eaced09503af9774e66b1 100644 (file)
--- a/libjava/ChangeLog
+++ b/libjava/ChangeLog
@@ -1,3 +1,12 @@
+2004-09-24  Guilhem Lavaux  <guilhem@kaffe.org>
+
+       * java/net/URL.java (URL): Delete whitespaces in the protocol string.
+
+2004-09-24  Jeroen Frijters  <jeroen@frijters.net>
+
+       * java/net/URL.java (URL(String,String,int,String,URLStreamHandler):
+       Don't set authority if host isn't specified.
+
 2004-09-24  Michael Koch  <konqueror@gmx.de>
 
        * gnu/java/nio/PipeImpl.java: Use VMPipe for native stuff.

diff --git a/libjava/java/net/URL.java b/libjava/java/net/URL.java
index 37ddc0f6cd4d4e5578f4ee4c29022b30cbaefbc5..bc891f4534400fffa9ba18b04a776b4b865ccd73 100644 (file)
--- a/libjava/java/net/URL.java
+++ b/libjava/java/net/URL.java
@@ -284,7 +284,7 @@ public final class URL implements Serializable
     this.host = host;
     this.port = port;
     this.authority = (host != null) ? host : "";
-    if (port >= 0)
+    if (port >= 0 && host != null)
        this.authority += ":" + port;
 
     int hashAt = file.indexOf('#');
@@ -427,6 +427,8 @@ public final class URL implements Serializable
 
       throw new MalformedURLException("Absolute URL required with null context");
 
+    protocol = protocol.trim();
+
     if (ph != null)
       {
        SecurityManager s = System.getSecurityManager();