aboutsummaryrefslogtreecommitdiff
path: root/libjava
diff options
context:
space:
mode:
Diffstat (limited to 'libjava')
-rw-r--r--libjava/ChangeLog5
-rw-r--r--libjava/gnu/gcj/protocol/file/Handler.java3
2 files changed, 7 insertions, 1 deletions
diff --git a/libjava/ChangeLog b/libjava/ChangeLog
index d5add01..31745a9 100644
--- a/libjava/ChangeLog
+++ b/libjava/ChangeLog
@@ -1,3 +1,8 @@
+2001-09-19 Anthony Green <green@redhat.com>
+
+ * gnu/gcj/protocol/file/Handler.java: Avoid NullPointerException
+ when host is null.
+
2001-09-17 Andreas Jaeger <aj@suse.de>
* jni.cc (array_from_valist): Use promoted types for va_arg.
diff --git a/libjava/gnu/gcj/protocol/file/Handler.java b/libjava/gnu/gcj/protocol/file/Handler.java
index b12ebd4..b4d8fbf 100644
--- a/libjava/gnu/gcj/protocol/file/Handler.java
+++ b/libjava/gnu/gcj/protocol/file/Handler.java
@@ -32,7 +32,8 @@ public class Handler extends URLStreamHandler
{
// If a hostname is set, then we need to switch protocols to ftp
// in order to transfer this from the remote host.
- if (! url.getHost().equals(""))
+ String host = url.getHost();
+ if ((host != null) && (! host.equals("")))
{
// Reset the protocol (and implicitly the handler) for this URL.
// Then have the URL attempt the connection again, as it will