2006-10-02 Gary Benson <gbenson@redhat.com>
* java/net/InetAddress.java (checkConnect): Reinstated. (loopbackAddress): Ensure initialized from non-null object. From-SVN: r117370
This commit is contained in:
parent
e227ac577f
commit
93a8f49bfa
|
@ -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>
|
||||
|
||||
* include/java-interp.h (prepared): Change type to pc_t.
|
||||
|
|
|
@ -101,6 +101,8 @@ public class InetAddress implements Serializable
|
|||
try
|
||||
{
|
||||
LOCALHOST = getByAddress("localhost", new byte[] {127, 0, 0, 1});
|
||||
// Some soon-to-be-removed native code synchronizes on this.
|
||||
loopbackAddress = LOCALHOST;
|
||||
}
|
||||
catch (UnknownHostException e)
|
||||
{
|
||||
|
@ -793,7 +795,7 @@ public class InetAddress implements Serializable
|
|||
static native String getLocalHostname();
|
||||
|
||||
// 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.
|
||||
InetAddress(byte[] ipaddr, String hostname)
|
||||
|
@ -805,9 +807,13 @@ public class InetAddress implements Serializable
|
|||
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)
|
||||
{
|
||||
return new InetAddress [count];
|
||||
}
|
||||
private static SecurityException checkConnect (String hostname)
|
||||
{
|
||||
return null;
|
||||
}
|
||||
}
|
||||
|
|
Loading…
Reference in New Issue