diff options
author | bryce <bryce@138bc75d-0d04-0410-961f-82ee72b054a4> | 1999-06-17 00:21:26 +0000 |
---|---|---|
committer | bryce <bryce@138bc75d-0d04-0410-961f-82ee72b054a4> | 1999-06-17 00:21:26 +0000 |
commit | 90c5432e0b5b02fdd51b51b55f7b59dee7129c50 (patch) | |
tree | 60f913e68f63815df730459c7b350b60a108a045 /libjava/java/net/Socket.java | |
parent | 57eaa5c05688ac0527e3dd0cf133edd33e6db57e (diff) | |
download | ppe42-gcc-90c5432e0b5b02fdd51b51b55f7b59dee7129c50.tar.gz ppe42-gcc-90c5432e0b5b02fdd51b51b55f7b59dee7129c50.zip |
* java/net/natPlainSocketImpl.cc (bind): Bind to any/all network
interfaces if host==NULL.
(accept): Throw message with InterruptedIOException.
(getOption): Cache localAddress.
* java/net/natPlainDatagramSocketImpl.cc (bind): Don't need
'address' for DatagramSocket.
(setTimeToLive): Fix compiler warnings.
(getOption): Cache localAddress.
* java/net/Socket.java (getLocalAddress): Don't need local
InetAddress object. Add FIXME comment about calling checkConnect().
* java/net/ServerSocket.java (ServerSocket(int)): Initialize
connection queue to 50 as per JDK 1.2 docs.
(ServerSocket(int,int)): Listen on all network interfaces by
default, per JDK 1.2 docs.
* java/net/PlainDatagramSocketImpl.java: Don't need 'address'.
Add localAddress caching.
git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@27559 138bc75d-0d04-0410-961f-82ee72b054a4
Diffstat (limited to 'libjava/java/net/Socket.java')
-rw-r--r-- | libjava/java/net/Socket.java | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/libjava/java/net/Socket.java b/libjava/java/net/Socket.java index db46db18e45..7dded58937b 100644 --- a/libjava/java/net/Socket.java +++ b/libjava/java/net/Socket.java @@ -129,10 +129,10 @@ public class Socket public InetAddress getLocalAddress () { - InetAddress localAddress; + // FIXME: see note in DatagramSocket.java about checkConnect() and security try { - localAddress = (InetAddress)impl.getOption(SocketOptions.SO_BINDADDR); + return (InetAddress)impl.getOption(SocketOptions.SO_BINDADDR); } catch (SocketException x) { @@ -140,7 +140,6 @@ public class Socket System.err.println(x); throw new java.lang.InternalError("Error in PlainSocketImpl.getOption"); } - return localAddress; } public int getPort () |