2003-11-30 Jeff Sturm <jsturm@one-point.com>

	* java/net/InetAddress.java:
	(static): Don'f force DNS request for ANY_IF address.

2003-11-30  Michael Koch  <konqueror@gmx.de>

	* java/net/InetAddress.java,
	java/net/natInetAddressNoNet.cc,
	java/net/natInetAddressPosix.cc,
	java/net/natInetAddressWin32.cc:
	Reverted my last patch.


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

1 files changed, 3 insertions, 18 deletions

diff --git a/libjava/java/net/InetAddress.java b/libjava/java/net/InetAddress.java
index f2c14f8380e..0a69c1aab07 100644
--- a/libjava/java/net/InetAddress.java
+++ b/libjava/java/net/InetAddress.java
@@ -82,7 +82,7 @@ public class InetAddress implements Serializable
       }
     
     byte[] zeros = { 0, 0, 0, 0 };
-    ANY_IF = new InetAddress (zeros, null);
+    ANY_IF = new InetAddress (zeros, "0.0.0.0");
   }
 
   /**
@@ -564,23 +564,8 @@ public class InetAddress implements Serializable
    */
   private static native byte[] aton (String host);
 
-  private static native InetAddress[] implLookup(String hostname,
-		                                 InetAddress addr,
-						 boolean all);
-
-  private static InetAddress[] lookup (String hostname,
-				       InetAddress addr, boolean all)
-  {
-    if (addr.equals(ANY_IF))
-      {
-	byte[] zeros = { 0, 0, 0, 0 };
-	InetAddress[] result = new InetAddress[1];
-	result[0] = new InetAddress(zeros, "0.0.0.0");
-	return result;
-      }
-
-    return implLookup(hostname, addr, all);
-  }
+  private static native InetAddress[] lookup (String hostname,
+		                              InetAddress addr, boolean all);
 
   private static native int getFamily (byte[] address);