diff options
| author | Michael Koch <konqueror@gmx.de> | 2003-12-25 17:31:13 +0000 |
|---|---|---|
| committer | Michael Koch <mkoch@gcc.gnu.org> | 2003-12-25 17:31:13 +0000 |
| commit | d9a81e87b6640eb67ea733fe241c34bcbd043bcc (patch) | |
| tree | b8f354a547bfd2a3e6d60753e704703f21ac3f30 | |
| parent | ac2b322259b04b7c158c49a771f629430afaadeb (diff) | |
| download | gcc-d9a81e87b6640eb67ea733fe241c34bcbd043bcc.zip gcc-d9a81e87b6640eb67ea733fe241c34bcbd043bcc.tar.gz gcc-d9a81e87b6640eb67ea733fe241c34bcbd043bcc.tar.bz2 | |
ServerSocket.java bind (): If InetSocketAddress.getAddress() returns "null" use "0.0.0.0" as address to...
2003-12-25 Michael Koch <konqueror@gmx.de>
* java/net/ServerSocket.java bind():
If InetSocketAddress.getAddress() returns "null" use "0.0.0.0" as
address to bind to.
From-SVN: r75023
| -rw-r--r-- | libjava/ChangeLog | 6 | ||||
| -rw-r--r-- | libjava/java/net/ServerSocket.java | 10 |
2 files changed, 14 insertions, 2 deletions
diff --git a/libjava/ChangeLog b/libjava/ChangeLog index 4c81138..ad2a815 100644 --- a/libjava/ChangeLog +++ b/libjava/ChangeLog @@ -1,3 +1,9 @@ +2003-12-25 Michael Koch <konqueror@gmx.de> + + * 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 <guilhem@kaffe.org> * java/io/ObjectInputStream.java diff --git a/libjava/java/net/ServerSocket.java b/libjava/java/net/ServerSocket.java index a691d20..597e641 100644 --- a/libjava/java/net/ServerSocket.java +++ b/libjava/java/net/ServerSocket.java @@ -221,14 +221,20 @@ public class ServerSocket throw new IllegalArgumentException ("Address type not supported"); InetSocketAddress tmp = (InetSocketAddress) endpoint; - + SecurityManager s = System.getSecurityManager (); 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; } |