Index: ChangeLog
===================================================================
RCS file: /cvs/gcc/gcc/libjava/ChangeLog,v
retrieving revision 1.2485
diff -u -b -B -r1.2485 ChangeLog
--- ChangeLog	23 Dec 2003 22:06:01 -0000	1.2485
+++ ChangeLog	25 Dec 2003 17:29:14 -0000
@@ -1,3 +1,9 @@
+2003-12-25  Michael Koch  <address@hidden>
+
+	* java/net/ServerSocket.java bind():
+	If InetSocketAddress.getAddress() returns "null" use "0.0.0.0" as
+	address to bind to.
+
 2003-12-23  Guilhem Lavaux <address@hidden>
 
 	* java/io/ObjectInputStream.java
Index: java/net/ServerSocket.java
===================================================================
RCS file: /cvs/gcc/gcc/libjava/java/net/ServerSocket.java,v
retrieving revision 1.32
diff -u -b -B -r1.32 ServerSocket.java
--- java/net/ServerSocket.java	9 Dec 2003 15:39:23 -0000	1.32
+++ java/net/ServerSocket.java	25 Dec 2003 17:29:14 -0000
@@ -226,9 +226,15 @@
     if (s != null)
       s.checkListen (tmp.getPort ());
 
+    InetAddress addr = tmp.getAddress();
+    
+    // Initialize addr with 0.0.0.0.
+    if (addr == null)
+      addr = InetAddress.ANY_IF;
+    
     try
       {
-	impl.bind (tmp.getAddress (), tmp.getPort ());
+	impl.bind(addr, tmp.getPort());
 	impl.listen(backlog);
 	bound = true;
       }