diff options
| author | mkoch <mkoch@138bc75d-0d04-0410-961f-82ee72b054a4> | 2003-05-05 20:18:31 +0000 |
|---|---|---|
| committer | mkoch <mkoch@138bc75d-0d04-0410-961f-82ee72b054a4> | 2003-05-05 20:18:31 +0000 |
| commit | 9457d1e514cd0c7531df656d96bba3557ced520c (patch) | |
| tree | 20e2588195ba45f0ac8baa4ac0148fc7b1d934d6 /libjava | |
| parent | debdfaa79e2902428c869612ff05199b9a2f0bb9 (diff) | |
| download | gcc-9457d1e514cd0c7531df656d96bba3557ced520c.tar.gz | |
2003-05-05 Michael Koch <konqueror@gmx.de>
* java/net/NetworkInterface.java
(networkInterfaces): Removed.
(getByName): Use getRealNetworkInterfaces() instead of
networkInterfaces.
(getByInetAddress): Likewise.
(getNetworkInterfaces): Likewise.
(toString): Fix output of addresses of an interface.
git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@66500 138bc75d-0d04-0410-961f-82ee72b054a4
Diffstat (limited to 'libjava')
| -rw-r--r-- | libjava/ChangeLog | 10 | ||||
| -rw-r--r-- | libjava/java/net/NetworkInterface.java | 15 |
2 files changed, 16 insertions, 9 deletions
diff --git a/libjava/ChangeLog b/libjava/ChangeLog index 11ec7b93c88..7a80c51d297 100644 --- a/libjava/ChangeLog +++ b/libjava/ChangeLog @@ -1,5 +1,15 @@ 2003-05-05 Michael Koch <konqueror@gmx.de> + * java/net/NetworkInterface.java + (networkInterfaces): Removed. + (getByName): Use getRealNetworkInterfaces() instead of + networkInterfaces. + (getByInetAddress): Likewise. + (getNetworkInterfaces): Likewise. + (toString): Fix output of addresses of an interface. + +2003-05-05 Michael Koch <konqueror@gmx.de> + * java/io/DataInputStream.java: Merged new documentation from classpath. diff --git a/libjava/java/net/NetworkInterface.java b/libjava/java/net/NetworkInterface.java index 9f8e8242963..4e8f4276c57 100644 --- a/libjava/java/net/NetworkInterface.java +++ b/libjava/java/net/NetworkInterface.java @@ -46,8 +46,6 @@ import java.util.Vector; */ public final class NetworkInterface { - private static Vector networkInterfaces; - private String name; private Vector inetAddresses; @@ -125,8 +123,7 @@ public final class NetworkInterface public static NetworkInterface getByName (String name) throws SocketException { - if (networkInterfaces == null) - networkInterfaces = getRealNetworkInterfaces (); + Vector networkInterfaces = getRealNetworkInterfaces (); for (Enumeration e = networkInterfaces.elements (); e.hasMoreElements (); ) @@ -151,8 +148,7 @@ public final class NetworkInterface public static NetworkInterface getByInetAddress (InetAddress addr) throws SocketException { - if (networkInterfaces == null) - networkInterfaces = getRealNetworkInterfaces (); + Vector networkInterfaces = getRealNetworkInterfaces (); for (Enumeration interfaces = networkInterfaces.elements (); interfaces.hasMoreElements (); ) @@ -179,10 +175,10 @@ public final class NetworkInterface public static Enumeration getNetworkInterfaces () throws SocketException { - if (networkInterfaces == null) - networkInterfaces = getRealNetworkInterfaces (); + Vector networkInterfaces = getRealNetworkInterfaces (); Enumeration tmp = networkInterfaces.elements (); + if (tmp.hasMoreElements ()) return tmp; @@ -200,6 +196,7 @@ public final class NetworkInterface return false; NetworkInterface tmp = (NetworkInterface) obj; + return (name.equals (tmp.name) && inetAddresses.equals (tmp.inetAddresses)); } @@ -229,7 +226,7 @@ public final class NetworkInterface e.hasMoreElements (); ) { InetAddress address = (InetAddress) e.nextElement (); - result += address.toString () + separator; + result += address.toString () + ";" + separator; } return result; |