diff options
| author | Michael Koch <konqueror@gmx.de> | 2003-03-03 08:26:52 +0000 |
|---|---|---|
| committer | Michael Koch <mkoch@gcc.gnu.org> | 2003-03-03 08:26:52 +0000 |
| commit | 6579ac0c00830fc5982afda361bc350ea2a84f7a (patch) | |
| tree | 6bf9b70421fe052b23d2db697187f4f0a980aed1 /libjava/java/net/URL.java | |
| parent | 6e1b3a7c949003ce1051d5bff4d162a80b418122 (diff) | |
| download | gcc-6579ac0c00830fc5982afda361bc350ea2a84f7a.zip gcc-6579ac0c00830fc5982afda361bc350ea2a84f7a.tar.gz gcc-6579ac0c00830fc5982afda361bc350ea2a84f7a.tar.bz2 | |
2003-03-03 Michael Koch <konqueror@gmx.de>
* java/net/DatagramSocket.java
(connect): Merged comment from classpath.
(receive): Merged documentation from classpath.
* java/net/Socket.java
(setSoTimeout): Clarified documentation.
* java/net/URL.java
(getPath): Merged from classpath.
(getUserInfo): Merged from classpath.
(getQuery): Merged from classpath.
* java/net/URLStreamHandler.java
(toExternalForm): Merged from classpath.
From-SVN: r63714
Diffstat (limited to 'libjava/java/net/URL.java')
| -rw-r--r-- | libjava/java/net/URL.java | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/libjava/java/net/URL.java b/libjava/java/net/URL.java index 98e7d5f..ba27bbe 100644 --- a/libjava/java/net/URL.java +++ b/libjava/java/net/URL.java @@ -472,8 +472,8 @@ public final class URL implements Serializable */ public String getPath() { - int quest = file.indexOf('?'); - return quest < 0 ? file : file.substring(0, quest); + int quest = (file == null) ? -1 : file.indexOf('?'); + return quest < 0 ? getFile() : file.substring(0, quest); } /** @@ -544,7 +544,7 @@ public final class URL implements Serializable */ public String getUserInfo () { - int at = host.indexOf('@'); + int at = (host == null) ? -1 : host.indexOf('@'); return at < 0 ? null : host.substring(0, at); } @@ -556,7 +556,7 @@ public final class URL implements Serializable */ public String getQuery () { - int quest = file.indexOf('?'); + int quest = (file == null) ? -1 : file.indexOf('?'); return quest < 0 ? null : file.substring(quest + 1, file.length()); } |