OpenE2K/gcc
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

[multiple changes]

Browse Source 
2004-07-17  Jeroen Frijters  <jeroen@frijters.net>

	* java/net/DatagramPacket.java (setAddress): Removed check for
	null address.

2004-07-17  Michael Koch  <konqueror@gmx.de>

	* 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
This commit is contained in:
Michael Koch 2004-07-17 11:17:28 +00:00
parent 4928181ca2
commit 320e32f649
4 changed files with 30 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
libjava/ChangeLog
View File

@ -1,3 +1,19 @@
2004-07-17 Jeroen Frijters <jeroen@frijters.net>
* java/net/DatagramPacket.java (setAddress): Removed check for
null address.
2004-07-17 Michael Koch <konqueror@gmx.de>
* 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.
2004-07-17 Mark Wielaard <mark@klomp.org>
* java/awt/event/InvocationEvent.java (dispatch): Synchronize

3
libjava/java/net/DatagramPacket.java
View File

@ -278,9 +278,6 @@ public final class DatagramPacket
*/
public synchronized void setAddress(InetAddress address)
{
if (address == null)
throw new NullPointerException("Null address");
this.address = address;
}

5
libjava/java/net/DatagramSocket.java
View File

@ -1,5 +1,6 @@
/* DatagramSocket.java -- A class to model UDP sockets
Copyright (C) 1998, 1999, 2000, 2002, 2003 Free Software Foundation, Inc.
Copyright (C) 1998, 1999, 2000, 2002, 2003, 2004
Free Software Foundation, Inc.
This file is part of GNU Classpath.
@ -282,7 +283,7 @@ public class DatagramSocket
*/
public InetAddress getLocalAddress()
{
if (isClosed())
if (! isBound())
return null;
InetAddress localAddr;

12
libjava/java/net/Socket.java
View File

@ -488,6 +488,9 @@ public class Socket
*/
public InetAddress getLocalAddress()
{
if (! isBound())
return null;
InetAddress addr = null;
try
@ -523,11 +526,10 @@ public class Socket
public int getPort()
{
if (! isConnected())
return 0;
return -1;
try
{
if (getImpl() != null)
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)