From 320e32f649fa1c9e4ae6832552c478653d605121 Mon Sep 17 00:00:00 2001 From: Michael Koch Date: Sat, 17 Jul 2004 11:17:28 +0000 Subject: [multiple changes] 2004-07-17 Jeroen Frijters * java/net/DatagramPacket.java (setAddress): Removed check for null address. 2004-07-17 Michael Koch * java/net/DatagramSocket.java (getLocalAddress): Check if socket is bound or not. * java/net/Socket.java (getLocalAddrss): Check if socket is bound or not. (getPort): Return -1 when not connected. Dont check getImpl() for null. (setReuseAddress): Check if socket is closed. (isConnected): Check if getImpl() returns null. From-SVN: r84864 --- libjava/java/net/Socket.java | 14 +++++++++++--- 1 file changed, 11 insertions(+), 3 deletions(-) (limited to 'libjava/java/net/Socket.java') diff --git a/libjava/java/net/Socket.java b/libjava/java/net/Socket.java index 43c6f3c3d50..714a958e6aa 100644 --- a/libjava/java/net/Socket.java +++ b/libjava/java/net/Socket.java @@ -488,6 +488,9 @@ public class Socket */ public InetAddress getLocalAddress() { + if (! isBound()) + return null; + InetAddress addr = null; try @@ -523,12 +526,11 @@ public class Socket public int getPort() { if (! isConnected()) - return 0; + return -1; try { - if (getImpl() != null) - return getImpl().getPort(); + return getImpl().getPort(); } catch (SocketException e) { @@ -1155,6 +1157,9 @@ public class Socket */ public void setReuseAddress(boolean reuseAddress) throws SocketException { + if (isClosed()) + throw new SocketException("socket is closed"); + getImpl().setOption(SocketOptions.SO_REUSEADDR, Boolean.valueOf(reuseAddress)); } @@ -1217,6 +1222,9 @@ public class Socket { try { + if (getImpl() == null) + return false; + return getImpl().getInetAddress() != null; } catch (SocketException e) -- cgit v1.2.3