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

2003-11-25 Michael Koch <konqueror@gmx.de>

Browse Source 
* java/net/DatagramSocket.java
	(DatagramSocket): Move binding code to bind(), simplify constructors.
	* java/net/MulticastSocket.java
	(MulticastSocket): Call parent constructor with null argument,
	bind socket after setReuseAddress is called, simplify constructors.

From-SVN: r73902
This commit is contained in:
Michael Koch 2003-11-24 23:00:07 +00:00 committed by Michael Koch
parent 4c1bbd67f9
commit 473432eb02
3 changed files with 72 additions and 56 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
libjava/ChangeLog
View File

@ -1,3 +1,11 @@
2003-11-25 Michael Koch <konqueror@gmx.de>
* java/net/DatagramSocket.java
(DatagramSocket): Move binding code to bind(), simplify constructors.
* java/net/MulticastSocket.java
(MulticastSocket): Call parent constructor with null argument,
bind socket after setReuseAddress is called, simplify constructors.
2003-11-24 Michael Koch <konqueror@gmx.de>
* javax/swing/BoxLayout.java

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

@ -138,60 +138,15 @@ public class DatagramSocket
* the specified local port and address.
*
* @param port The local port number to bind to.
* @param laddr The local address to bind to.
* @param addr The local address to bind to.
*
* @exception SecurityException If a security manager exists and its
* checkListen method doesn't allow the operation.
* @exception SocketException If an error occurs.
*/
public DatagramSocket(int port, InetAddress laddr) throws SocketException
public DatagramSocket(int port, InetAddress addr) throws SocketException
{
if (port < 0 || port > 65535)
throw new IllegalArgumentException("Invalid port: " + port);
SecurityManager s = System.getSecurityManager();
if (s != null)
s.checkListen(port);
String propVal = System.getProperty("impl.prefix");
if (propVal == null || propVal.equals(""))
impl = new PlainDatagramSocketImpl();
else
try
{
impl = (DatagramSocketImpl) Class.forName
("java.net." + propVal + "DatagramSocketImpl").newInstance();
}
catch (Exception e)
{
System.err.println("Could not instantiate class: java.net." +
propVal + "DatagramSocketImpl");
impl = new PlainDatagramSocketImpl();
}
impl.create();
if (laddr == null)
laddr = InetAddress.ANY_IF;
try
{
impl.bind (port, laddr);
}
catch (SocketException exception)
{
impl.close ();
throw exception;
}
catch (RuntimeException exception)
{
impl.close ();
throw exception;
}
catch (Error error)
{
impl.close ();
throw error;
}
this(new InetSocketAddress(addr, port));
}
/**
@ -209,8 +164,61 @@ public class DatagramSocket
*/
public DatagramSocket (SocketAddress address) throws SocketException
{
this (((InetSocketAddress) address).getPort (),
((InetSocketAddress) address).getAddress ());
String propVal = System.getProperty("impl.prefix");
if (propVal == null || propVal.equals(""))
impl = new PlainDatagramSocketImpl();
else
try
{
impl = (DatagramSocketImpl) Class.forName
("java.net." + propVal + "DatagramSocketImpl").newInstance();
}
catch (Exception e)
{
System.err.println("Could not instantiate class: java.net." +
propVal + "DatagramSocketImpl");
impl = new PlainDatagramSocketImpl();
}
impl.create();
if (address == null)
return;
if (! (address instanceof InetSocketAddress))
throw new SocketException("unsupported address type");
InetAddress addr = ((InetSocketAddress) address).getAddress();
int port = ((InetSocketAddress) address).getPort();
if (port < 0 || port > 65535)
throw new IllegalArgumentException("Invalid port: " + port);
SecurityManager s = System.getSecurityManager();
if (s != null)
s.checkListen(port);
if (addr == null)
addr = InetAddress.ANY_IF;
try
{
impl.bind(port, addr);
}
catch (SocketException exception)
{
impl.close();
throw exception;
}
catch (RuntimeException exception)
{
impl.close();
throw exception;
}
catch (Error error)
{
impl.close();
throw error;
}
}
/**

10
libjava/java/net/MulticastSocket.java
View File

@ -80,8 +80,7 @@ public class MulticastSocket extends DatagramSocket
*/
public MulticastSocket() throws IOException
{
super(0, null);
setReuseAddress (true);
this(new InetSocketAddress(0));
}
/**
@ -95,8 +94,7 @@ public class MulticastSocket extends DatagramSocket
*/
public MulticastSocket(int port) throws IOException
{
super(port, null);
setReuseAddress (true);
this(new InetSocketAddress(port));
}
/**
@ -112,8 +110,10 @@ public class MulticastSocket extends DatagramSocket
*/
public MulticastSocket(SocketAddress address) throws IOException
{
super(address);
super((SocketAddress) null);
setReuseAddress(true);
if (address != null)
bind(address);
}
/**