2003-10-02 Guilhem Lavaux <guilhem@kaffe.org>

	* java/net/InetSocketAddress.java
	(InetSocketAddress): Made exception more clear.
	(equals): Handle case when addr is null.
	(toString): Likewise.
	* java/net/NetworkInterface.java
	(static): Load native library.
	(getNetworkInterfaces): Rewritten.


git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@72047 138bc75d-0d04-0410-961f-82ee72b054a4

1 files changed, 13 insertions, 6 deletions

diff --git a/libjava/java/net/NetworkInterface.java b/libjava/java/net/NetworkInterface.java
index c3eb7108002..f6d37489836 100644
--- a/libjava/java/net/NetworkInterface.java
+++ b/libjava/java/net/NetworkInterface.java
@@ -37,6 +37,7 @@ exception statement from your version. */
 
 package java.net;
 
+import gnu.classpath.Configuration;
 import java.util.Enumeration;
 import java.util.Vector;
 
@@ -52,6 +53,14 @@ import java.util.Vector;
  */
 public final class NetworkInterface
 {
+  static
+  {
+    if (Configuration.INIT_LOAD_LIBRARY)
+      {
+	System.loadLibrary ("javanet");
+      }
+  }
+
   private String name;
   
   private Vector inetAddresses;
@@ -185,14 +194,12 @@ public final class NetworkInterface
   public static Enumeration getNetworkInterfaces ()
     throws SocketException
   {
-    Vector networkInterfaces = getRealNetworkInterfaces ();
-
-    Enumeration tmp = networkInterfaces.elements ();
+    Vector networkInterfaces = getRealNetworkInterfaces();
 
-    if (tmp.hasMoreElements ())
-      return tmp;
+    if (networkInterfaces.isEmpty())
+      return null;
 
-    return null;
+    return networkInterfaces.elements();
   }
 
   /**