diff options
| author | mkoch <mkoch@138bc75d-0d04-0410-961f-82ee72b054a4> | 2004-09-24 06:51:59 +0000 |
|---|---|---|
| committer | mkoch <mkoch@138bc75d-0d04-0410-961f-82ee72b054a4> | 2004-09-24 06:51:59 +0000 |
| commit | db9176e470a9534c9d275dfd3063cedcea603cf5 (patch) | |
| tree | 493475f4231f981378d82dc0ffb1b3154b99c857 /libjava | |
| parent | df703397997cf04c738d9ac7288bf44cddfd005a (diff) | |
| download | gcc-db9176e470a9534c9d275dfd3063cedcea603cf5.tar.gz | |
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.
git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@88015 138bc75d-0d04-0410-961f-82ee72b054a4
Diffstat (limited to 'libjava')
| -rw-r--r-- | libjava/ChangeLog | 9 | ||||
| -rw-r--r-- | libjava/java/net/URL.java | 4 |
2 files changed, 12 insertions, 1 deletions
diff --git a/libjava/ChangeLog b/libjava/ChangeLog index 1a43194cd23..234a0f3bda3 100644 --- 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 37ddc0f6cd4..bc891f45344 100644 --- 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(); |