diff options
author | Gary Benson <gbenson@redhat.com> | 2006-10-02 10:54:43 +0000 |
---|---|---|
committer | Gary Benson <gbenson@redhat.com> | 2006-10-02 10:54:43 +0000 |
commit | 3c297c971027237275a48b39990958d2d99c2f11 (patch) | |
tree | faae9c4f450f3b428a2307033612d43570d10842 /libjava | |
parent | ccf1fe1653b540836fe40d3c9307901f16a28a72 (diff) |
2006-10-02 Gary Benson <gbenson@redhat.com>
* java/net/InetAddress.java
(checkConnect): Reinstated.
(loopbackAddress): Ensure initialized from non-null object.
git-svn-id: https://gcc.gnu.org/svn/gcc/trunk@117370 138bc75d-0d04-0410-961f-82ee72b054a4
Diffstat (limited to 'libjava')
-rw-r--r-- | libjava/ChangeLog | 6 | ||||
-rw-r--r-- | libjava/java/net/InetAddress.java | 10 |
2 files changed, 14 insertions, 2 deletions
diff --git a/libjava/ChangeLog b/libjava/ChangeLog index 177ac48d295..21cbc61d013 100644 --- a/libjava/ChangeLog +++ b/libjava/ChangeLog @@ -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. diff --git a/libjava/java/net/InetAddress.java b/libjava/java/net/InetAddress.java index bef9a6ecf19..06e9658fbf6 100644 --- a/libjava/java/net/InetAddress.java +++ b/libjava/java/net/InetAddress.java @@ -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; + } } |