2004-10-18 Michael Koch <konqueror@gmx.de>

	* java/net/Inet4Address.java: Merged file header and javadocs.
	* java/net/Inet6Address.java: Likewise.
	* java/net/InetAddress.java
	(getCanonicalHostName): Create Inet4Address object instead of
	InetAddress and add comment regarding IPv6.
	(toString): Simplified.

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

diff --git a/libjava/ChangeLog b/libjava/ChangeLog
index 080afaf..ded9f94 100644 (file)
--- a/libjava/ChangeLog
+++ b/libjava/ChangeLog
@@ -1,5 +1,14 @@
 2004-10-18  Michael Koch  <konqueror@gmx.de>
 
+       * java/net/Inet4Address.java: Merged file header and javadocs.
+       * java/net/Inet6Address.java: Likewise.
+       * java/net/InetAddress.java
+       (getCanonicalHostName): Create Inet4Address object instead of
+       InetAddress and add comment regarding IPv6.
+       (toString): Simplified.
+
+2004-10-18  Michael Koch  <konqueror@gmx.de>
+
        * gnu/java/net/protocol/http/Connection.java,
        java/nio/MappedByteBufferImpl.java,
        java/text/RuleBasedCollator.java,

diff --git a/libjava/java/net/Inet4Address.java b/libjava/java/net/Inet4Address.java
index 25629c8..917e9e3 100644 (file)
--- a/libjava/java/net/Inet4Address.java
+++ b/libjava/java/net/Inet4Address.java
@@ -1,5 +1,5 @@
-/* Inet4Address.java
-   Copyright (C) 2002, 2003 Free Software Foundation, Inc.
+/* Inet4Address.java --
+   Copyright (C) 2002, 2003, 2004  Free Software Foundation, Inc.
 
 This file is part of GNU Classpath.
 
@@ -35,23 +35,20 @@ this exception to your version of the library, but you are not
 obligated to do so.  If you do not wish to do so, delete this
 exception statement from your version. */
 
+
 package java.net;
 
 import java.io.ObjectStreamException;
 import java.util.Arrays;
 
-
-/**
- * @author Michael Koch
- * @date August 3, 2002.
- */
-
 /*
  * Written using on-line Java Platform 1.4 API Specification and
  * RFC 1884 (http://www.ietf.org/rfc/rfc1884.txt),
  * RFC 1918 (http://www.ietf.org/rfc/rfc1918.txt),
  * RFC 2365 (http://www.ietf.org/rfc/rfc2365.txt)
- * Status: Believed complete and correct.
+ *
+ * @author Michael Koch
+ * @status Believed complete and correct.
  */
 public final class Inet4Address extends InetAddress
 {
@@ -67,12 +64,14 @@ public final class Inet4Address extends InetAddress
   {
     return new InetAddress(addr, hostName);
   }
-
+  
   /**
-   * Creates a Inet4Address
+   * Initializes this object's addr instance variable from the passed in
+   * byte array.  Note that this constructor is protected and is called
+   * only by static methods in this class.
    *
-   * @param addr The IP address
-   * @param host The Hostname
+   * @param addr The IP number of this address as an array of bytes
+   * @param hostname The hostname of this IP address.
    */
   Inet4Address(byte[] addr, String host)
   {

diff --git a/libjava/java/net/Inet6Address.java b/libjava/java/net/Inet6Address.java
index 5d52735..e0329d5 100644 (file)
--- a/libjava/java/net/Inet6Address.java
+++ b/libjava/java/net/Inet6Address.java
@@ -1,5 +1,5 @@
-/* Inet6Address.java
-   Copyright (C) 2002, 2003 Free Software Foundation, Inc.
+/* Inet6Address.java --
+   Copyright (C) 2002, 2003, 2004  Free Software Foundation, Inc.
 
 This file is part of GNU Classpath.
 
@@ -35,20 +35,17 @@ this exception to your version of the library, but you are not
 obligated to do so.  If you do not wish to do so, delete this
 exception statement from your version. */
 
+
 package java.net;
 
 import java.util.Arrays;
 
-
-/**
- * @author Michael Koch
- * @date August 3, 2002.
- */
-
 /*
  * Written using on-line Java Platform 1.4 API Specification and
  * RFC 1884 (http://www.ietf.org/rfc/rfc1884.txt)
- * Status: Believed complete and correct.
+ * 
+ * @author Michael Koch
+ * @status Believed complete and correct.
  */
 public final class Inet6Address extends InetAddress
 {

diff --git a/libjava/java/net/InetAddress.java b/libjava/java/net/InetAddress.java
index 51bcf3a..06e1a24 100644 (file)
--- a/libjava/java/net/InetAddress.java
+++ b/libjava/java/net/InetAddress.java
@@ -313,7 +313,7 @@ public class InetAddress implements Serializable
       {
         try
          {
-            sm.checkConnect (hostName, -1);
+            sm.checkConnect(hostName, -1);
          }
        catch (SecurityException e)
          {
@@ -322,7 +322,8 @@ public class InetAddress implements Serializable
       }
 
     // Try to find the FDQN now
-    InetAddress address = new InetAddress (getAddress(), null);
+    // FIXME: This does not work with IPv6.
+    InetAddress address = new Inet4Address(getAddress(), null);
     return address.getHostName();
   }
 
@@ -487,14 +488,8 @@ public class InetAddress implements Serializable
    */
   public String toString()
   {
-    String host;
     String address = getHostAddress();
-
-    if (hostName != null)
-      host = hostName;
-    else
-      host = address;
-
+    String host = (hostName != null) ? hostName : address;
     return host + "/" + address;
   }