diff options
| -rw-r--r-- | ChangeLog | 6 | ||||
| -rw-r--r-- | java/net/InetSocketAddress.java | 24 | ||||
| -rw-r--r-- | java/net/Socket.java | 17 |
3 files changed, 24 insertions, 23 deletions
@@ -1,5 +1,11 @@ 2003-06-18 Michael Koch <konqueror@gmx.de> + * java/net/InetSocketAddress.java, + java/net/Socket.java: + New versions from libgcj. + +2003-06-18 Michael Koch <konqueror@gmx.de> + * java/util/Locale.java, java/util/PropertyResourceBundle.java, java/util/prefs/AbstractPreferences.java, diff --git a/java/net/InetSocketAddress.java b/java/net/InetSocketAddress.java index 3c54b51a0..c720fbcfe 100644 --- a/java/net/InetSocketAddress.java +++ b/java/net/InetSocketAddress.java @@ -69,6 +69,9 @@ public class InetSocketAddress extends SocketAddress { if (port < 0 || port > 65535) throw new IllegalArgumentException(); + + if (addr == null) + addr = InetAddress.ANY_IF; this.addr = addr; this.port = port; @@ -85,25 +88,9 @@ public class InetSocketAddress extends SocketAddress public InetSocketAddress(int port) throws IllegalArgumentException { - if (port < 0 || port > 65535) - throw new IllegalArgumentException(); - - this.port = port; - - try - { - byte[] any = { 0, 0, 0, 0 }; - this.addr = InetAddress.getByAddress (any); - this.hostname = "0.0.0.0"; - } - catch (UnknownHostException e) - { - this.addr = null; - this.hostname = ""; - } + this ((InetAddress) null, port); } - /** * Constructs an InetSocketAddress instance. * @@ -115,7 +102,8 @@ public class InetSocketAddress extends SocketAddress public InetSocketAddress(String hostname, int port) throws IllegalArgumentException { - if (port < 0 || port > 65535) + if (port < 0 || port > 65535 + || hostname == null) throw new IllegalArgumentException(); this.port = port; diff --git a/java/net/Socket.java b/java/net/Socket.java index 8535fa9ef..38b31ec8c 100644 --- a/java/net/Socket.java +++ b/java/net/Socket.java @@ -37,7 +37,9 @@ exception statement from your version. */ package java.net; -import java.io.*; +import java.io.InputStream; +import java.io.IOException; +import java.io.OutputStream; import java.nio.channels.SocketChannel; import java.nio.channels.IllegalBlockingModeException; @@ -87,8 +89,6 @@ public class Socket private boolean closed = false; - // Constructors - /** * Initializes a new instance of <code>Socket</code> object without * connecting to a remote host. This useful for subclasses of socket that @@ -282,6 +282,9 @@ public class Socket { this(); + if (raddr == null) + throw new NullPointerException (); + if (impl == null) throw new IOException("Cannot initialize Socket implementation"); @@ -289,8 +292,12 @@ public class Socket if (sm != null) sm.checkConnect(raddr.getHostName(), rport); - // bind/connect socket - bind (new InetSocketAddress (laddr, lport)); + // bind socket + SocketAddress bindaddr = + laddr == null ? null : new InetSocketAddress (laddr, lport); + bind (bindaddr); + + // connect socket connect (new InetSocketAddress (raddr, rport)); // FIXME: JCL p. 1586 says if localPort is unspecified, bind to any port, |