2004-09-21 Michael Koch <konqueror@gmx.de>

	* java/net/Socket.java
	(getLocalAddress): Return InetAddress.ANY_IF if not bound yet.

From-SVN: r87817

diff --git a/libjava/ChangeLog b/libjava/ChangeLog
index a9e1aa921a060e1cde055eb5f0135ceedc50a37a..6ad67cff35019620bce79ce1cc52fdcffa5715ff 100644 (file)
--- a/libjava/ChangeLog
+++ b/libjava/ChangeLog
@@ -1,3 +1,8 @@
+2004-09-21  Michael Koch  <konqueror@gmx.de>
+
+       * java/net/Socket.java
+       (getLocalAddress): Return InetAddress.ANY_IF if not bound yet.
+
 2004-09-21  Casey Marshall  <csm@gnu.org>
 
        * javax/crypto/MacSpi.java (clone): Provide meaningful

diff --git a/libjava/java/net/Socket.java b/libjava/java/net/Socket.java
index 8855958cff02978ea6dbf2835ea2bc4b8c08a25e..80caced4e33f50a4d3111530d7edd0c7c915d560 100644 (file)
--- a/libjava/java/net/Socket.java
+++ b/libjava/java/net/Socket.java
@@ -479,7 +479,8 @@ public class Socket
 
   /**
    * Returns the local address to which this socket is bound.  If this socket
-   * is not connected, then <code>null</code> is returned.
+   * is not connected, then a wildcard address, for which
+   * @see isAnyLocalAddress() is <code>true</code>, is returned.
    *
    * @return The local address
    *
@@ -488,7 +489,7 @@ public class Socket
   public InetAddress getLocalAddress()
   {
     if (! isBound())
-      return null;
+      return InetAddress.ANY_IF;
 
     InetAddress addr = null;