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

2003-05-05 Michael Koch <konqueror@gmx.de>

Browse source 
* java/net/NetworkInterface.java
	(networkInterfaces): Removed.
	(getByName): Use getRealNetworkInterfaces() instead of
	networkInterfaces.
	(getByInetAddress): Likewise.
	(getNetworkInterfaces): Likewise.
	(toString): Fix output of addresses of an interface.

From-SVN: r66500
This commit is contained in:
Michael Koch 2003-05-05 20:18:31 +00:00 • committed by Michael Koch
parent bc9ec0e06b
commit e5f3cd6b64
2 changed files with 16 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
libjava/ChangeLog
View file

@ -1,3 +1,13 @@
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:

15
libjava/java/net/NetworkInterface.java
View file

@ -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;