re PR libgcj/14695 ([3.3/3.4 only] java.net.NetworkInterface.getByName() throws excep...

2004-05-03  Michael Koch  <konqueror@gmx.de>

	Fixes PR libgcj/14695:
	* java/net/NetworkInterface.java
	(getByName): Return null when no interface was found.

From-SVN: r81434

diff --git a/libjava/ChangeLog b/libjava/ChangeLog
index e2968ca346f6de7cb71aab35f650101c4412a6f3..68af3d44ada36e878e7f2db3ab805092c7987796 100644 (file)
--- a/libjava/ChangeLog
+++ b/libjava/ChangeLog
@@ -1,3 +1,9 @@
+2004-05-03  Michael Koch  <konqueror@gmx.de>
+
+       Fixes PR libgcj/14695:
+       * java/net/NetworkInterface.java
+       (getByName): Return null when no interface was found.
+
 2004-04-30  Ranjit Mathew  <rmathew@hotmail.com>
             Tom Tromey  <tromey@redhat.com>
 

diff --git a/libjava/java/net/NetworkInterface.java b/libjava/java/net/NetworkInterface.java
index e7f7290febcce735cd330e4e92e0b1015dfd25b9..ab6d7b4263ffe9e12d196de94bd3c7d709cc782b 100644 (file)
--- a/libjava/java/net/NetworkInterface.java
+++ b/libjava/java/net/NetworkInterface.java
@@ -130,12 +130,15 @@ public final class NetworkInterface
   }
 
   /**
-   *  Returns an network interface by name
+   * Returns an network interface by name
    *
-   *  @param name The name of the interface to return
+   * @param name The name of the interface to return
+   * 
+   * @return a <code>NetworkInterface</code> object representing the interface,
+   * or null if there is no interface with that name.
    *
-   *  @exception SocketException If an error occurs
-   *  @exception NullPointerException If the specified name is null
+   * @exception SocketException If an error occurs
+   * @exception NullPointerException If the specified name is null
    */
   public static NetworkInterface getByName(String name)
     throws SocketException
@@ -150,7 +153,8 @@ public final class NetworkInterface
          return tmp;
       }
 
-    throw new SocketException("no network interface with this name exists");
+    // No interface with the given name found.
+    return null;
   }
 
   /**