FreeChainXenon/gcc
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

2003-10-02 Guilhem Lavaux <guilhem@kaffe.org>

Browse source 
* java/net/InetSocketAddress.java
	(InetSocketAddress): Made exception more clear.
	(equals): Handle case when addr is null.
	(toString): Likewise.
	* java/net/NetworkInterface.java
	(static): Load native library.
	(getNetworkInterfaces): Rewritten.

From-SVN: r72047
This commit is contained in:
Guilhem Lavaux 2003-10-02 19:29:31 +00:00 • committed by Michael Koch
parent bca48dc625
commit d1aa479583
3 changed files with 38 additions and 13 deletions
Download patch file Download diff file Expand all files Collapse all files

22
libjava/java/net/InetSocketAddress.java
View file

@ -68,7 +68,7 @@ public class InetSocketAddress extends SocketAddress
throws IllegalArgumentException
{
if (port < 0 || port > 65535)
throw new IllegalArgumentException();
throw new IllegalArgumentException ("Bad port number: " + port);
if (addr == null)
addr = InetAddress.ANY_IF;
@ -102,9 +102,11 @@ public class InetSocketAddress extends SocketAddress
public InetSocketAddress(String hostname, int port)
throws IllegalArgumentException
{
if (port < 0 || port > 65535
|| hostname == null)
throw new IllegalArgumentException();
if (hostname == null)
throw new IllegalArgumentException ("Null host name value");
if (port < 0 || port > 65535)
throw new IllegalArgumentException ("Bad port number: " + port);
this.port = port;
this.hostname = hostname;
@ -130,8 +132,14 @@ public class InetSocketAddress extends SocketAddress
if (obj instanceof InetSocketAddress)
{
InetSocketAddress a = (InetSocketAddress) obj;
return addr.equals(a.addr) && a.port == port;
InetSocketAddress sa = (InetSocketAddress) obj;
if (addr == null && sa.addr != null)
return false;
else if (addr == null && sa.addr == null)
return hostname.equals (sa.hostname) && sa.port == port;
else
return addr.equals (sa.addr) && sa.port == port;
}
return false;
@ -183,6 +191,6 @@ public class InetSocketAddress extends SocketAddress
*/
public String toString()
{
return addr + ":" + port;
return (addr == null ? hostname : addr.getHostName()) + ":" + port;
}
}