Fix null pointer bug.

From-SVN: r45692

diff --git a/libjava/ChangeLog b/libjava/ChangeLog
index d5add01d2dac94080a734ae657abd78ebe3a3490..31745a9bc08d9a1d3451a3bf972e7d59e176acc7 100644 (file)
--- 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 b12ebd42b290424da817bb21c4b09df96a1d7915..b4d8fbfbe42488cc9aaa40b1b1a2ba099ce8045b 100644 (file)
--- 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