* gnu/java/net/protocol/http/HttpURLConnection.java: fixed NullPointerException.

* gnu/java/net/protocol/http/Handler.java: override getDefaultPort() to return 80

3 files changed, 16 insertions, 1 deletions

diff --git a/ChangeLog b/ChangeLog
index 897a45302..bd6564b9b 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2003-08-11  Ingo Proetel  <proetel@aicas.com>
+
+	* gnu/java/net/protocol/http/HttpURLConnection.java: fixed NullPointerException.
+	* gnu/java/net/protocol/http/Handler.java: override getDefaultPort() to return 80
+
 2003-08-11  Ingo Proetel <proetel@aicas.com>
 
 	* native/jni/classpath/jcl.c: removed static array for error string.
diff --git a/gnu/java/net/protocol/http/Handler.java b/gnu/java/net/protocol/http/Handler.java
index 9bc79f2c4..a9a04d855 100644
--- a/gnu/java/net/protocol/http/Handler.java
+++ b/gnu/java/net/protocol/http/Handler.java
@@ -91,5 +91,14 @@ openConnection(URL url) throws IOException
   return(new gnu.java.net.protocol.http.HttpURLConnection(url));
 }
 
+
+/**
+ * Returns the default port for a URL parsed by this handler.
+ */
+protected int getDefaultPort ()
+{
+  return 80;
+}
+
 } // class Handler
 
diff --git a/gnu/java/net/protocol/http/HttpURLConnection.java b/gnu/java/net/protocol/http/HttpURLConnection.java
index 71d8529ae..615a00529 100644
--- a/gnu/java/net/protocol/http/HttpURLConnection.java
+++ b/gnu/java/net/protocol/http/HttpURLConnection.java
@@ -291,7 +291,8 @@ disconnect()
 {
   try
     {
-      socket.close();
+      if (socket != null)
+	socket.close();
     }
   catch(IOException e) { ; }
 }