diff options
| author | David Daney <ddaney@avtrex.com> | 2004-09-23 00:34:09 +0000 |
|---|---|---|
| committer | David Daney <daney@gcc.gnu.org> | 2004-09-23 00:34:09 +0000 |
| commit | d0259e11e7c68f2dbc212e5a31efc2a02dd79add (patch) | |
| tree | dab349a2a8a7e8e9c0d52ceedeaaf2ee208f2d47 /libjava/java | |
| parent | dfb77e3751ae374d52a4e59bd8885d13530a291a (diff) | |
| download | gcc-d0259e11e7c68f2dbc212e5a31efc2a02dd79add.zip gcc-d0259e11e7c68f2dbc212e5a31efc2a02dd79add.tar.gz gcc-d0259e11e7c68f2dbc212e5a31efc2a02dd79add.tar.bz2 | |
re PR libgcj/17623 (URL does not retain userInfo across context constructor.)
PR libgcj/17623
* java/net/URL.java (URL): Copy userInfo from context.
(getUserInfo): Return cached userInfo if present.
From-SVN: r87909
Diffstat (limited to 'libjava/java')
| -rw-r--r-- | libjava/java/net/URL.java | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/libjava/java/net/URL.java b/libjava/java/net/URL.java index 7357c75..37ddc0f 100644 --- a/libjava/java/net/URL.java +++ b/libjava/java/net/URL.java @@ -1,5 +1,6 @@ /* URL.java -- Uniform Resource Locator Class - Copyright (C) 1998, 1999, 2000, 2002, 2003 Free Software Foundation, Inc. + Copyright (C) 1998, 1999, 2000, 2002, 2003, 2004 + Free Software Foundation, Inc. This file is part of GNU Classpath. @@ -401,6 +402,7 @@ public final class URL implements Serializable host = context.host; port = context.port; file = context.file; + userInfo = context.userInfo; if (file == null || file.length() == 0) file = "/"; authority = context.authority; @@ -415,6 +417,7 @@ public final class URL implements Serializable host = context.host; port = context.port; file = context.file; + userInfo = context.userInfo; if (file == null || file.length() == 0) file = "/"; authority = context.authority; @@ -612,6 +615,8 @@ public final class URL implements Serializable */ public String getUserInfo() { + if (userInfo != null) + return userInfo; int at = (host == null) ? -1 : host.indexOf('@'); return at < 0 ? null : host.substring(0, at); } |