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

2006-10-02 Gary Benson <gbenson@redhat.com>

Browse source 
* java/net/InetAddress.java
	(checkConnect): Reinstated.
	(loopbackAddress): Ensure initialized from non-null object.

From-SVN: r117370
This commit is contained in:
Gary Benson 2006-10-02 10:54:43 +00:00 • committed by Gary Benson
parent e227ac577f
commit 93a8f49bfa
2 changed files with 14 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

6
libjava/ChangeLog
View file

@ -1,3 +1,9 @@
2006-10-02 Gary Benson <gbenson@redhat.com>
* java/net/InetAddress.java
(checkConnect): Reinstated.
(loopbackAddress): Ensure initialized from non-null object.
2006-09-30 Keith Seitz <keiths@redhat.com> 2006-09-30 Keith Seitz <keiths@redhat.com>
* include/java-interp.h (prepared): Change type to pc_t. * include/java-interp.h (prepared): Change type to pc_t.

10
libjava/java/net/InetAddress.java
View file

@ -101,6 +101,8 @@ public class InetAddress implements Serializable
try try
{ {
LOCALHOST = getByAddress("localhost", new byte[] {127, 0, 0, 1}); LOCALHOST = getByAddress("localhost", new byte[] {127, 0, 0, 1});
// Some soon-to-be-removed native code synchronizes on this.
loopbackAddress = LOCALHOST;
} }
catch (UnknownHostException e) catch (UnknownHostException e)
{ {
@ -793,7 +795,7 @@ public class InetAddress implements Serializable
static native String getLocalHostname(); static native String getLocalHostname();
// Some soon-to-be-removed native code synchronizes on this. // Some soon-to-be-removed native code synchronizes on this.
static InetAddress loopbackAddress = LOCALHOST; static InetAddress loopbackAddress;
// Some soon-to-be-removed code uses this old and broken method. // Some soon-to-be-removed code uses this old and broken method.
InetAddress(byte[] ipaddr, String hostname) InetAddress(byte[] ipaddr, String hostname)
@ -805,9 +807,13 @@ public class InetAddress implements Serializable
family = getFamily(ipaddr); family = getFamily(ipaddr);
} }
// Some soon-to-be-removed native code uses this old method. // Some soon-to-be-removed native code uses these old methods.
private static InetAddress[] allocArray (int count) private static InetAddress[] allocArray (int count)
{ {
return new InetAddress [count]; return new InetAddress [count];
} }
private static SecurityException checkConnect (String hostname)
{
return null;
}
} }