[kaffe] CVS kaffe (dalibor): Resynced with GNU Classpath: Reformatted InetAddress

[Kaffe CVS]

PatchSet 4552 
Date: 2004/03/21 20:29:59
Author: dalibor
Branch: HEAD
Tag: (none) 
Log:
Resynced with GNU Classpath: Reformatted InetAddress

2004-03-21  Dalibor Topic <robilad@kaffe.org>

        Resynced with GNU Classpath.

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

        * java/net/InetAddress.java: Reformated.
        (equals): Removed unneeded pointer check.

Members: 
	ChangeLog:1.2130->1.2131 
	libraries/javalib/java/net/InetAddress.java:1.19->1.20 

Index: kaffe/ChangeLog
diff -u kaffe/ChangeLog:1.2130 kaffe/ChangeLog:1.2131
--- kaffe/ChangeLog:1.2130	Sun Mar 21 19:49:37 2004
+++ kaffe/ChangeLog	Sun Mar 21 20:29:59 2004
@@ -4,6 +4,15 @@
 
 	2004-03-20  Michael Koch  <konqueror@gmx.de>
 
+        * java/net/InetAddress.java: Reformated.
+        (equals): Removed unneeded pointer check.
+
+2004-03-21  Dalibor Topic <robilad@kaffe.org>
+
+	Resynced with GNU Classpath.
+
+	2004-03-20  Michael Koch  <konqueror@gmx.de>
+
         * gnu/java/net/protocol/http/Connection.java
         (getOutputStream): Dont set POST method.
 
Index: kaffe/libraries/javalib/java/net/InetAddress.java
diff -u kaffe/libraries/javalib/java/net/InetAddress.java:1.19 kaffe/libraries/javalib/java/net/InetAddress.java:1.20
--- kaffe/libraries/javalib/java/net/InetAddress.java:1.19	Fri Oct 31 15:15:44 2003
+++ kaffe/libraries/javalib/java/net/InetAddress.java	Sun Mar 21 20:30:01 2004
@@ -97,6 +97,7 @@
    * Dummy InetAddress, used to bind socket to any (all) network interfaces.
    */
   static InetAddress ANY_IF;
+    
 
   /**
    * The size of the cache.
@@ -301,7 +302,6 @@
   {
     // This is the IPv4 implementation.
     // Any class derived from InetAddress should override this.
-    
     return equals (ANY_IF);
   }
 
@@ -530,8 +530,7 @@
    */
   public boolean equals (Object obj)
   {
-    if (obj == null
-        || ! (obj instanceof InetAddress))
+    if (! (obj instanceof InetAddress))
       return false;
     
     // "The Java Class Libraries" 2nd edition says "If a machine has
@@ -656,7 +655,7 @@
    * Returns an InetAddress object representing the IP address of the given
    * hostname.  This name can be either a hostname such as "www.urbanophile.com"
    * or an IP address in dotted decimal format such as "127.0.0.1".  If the
-   * hostname is null, the hostname of the local machine is supplied by
+   * hostname is null or "", the hostname of the local machine is supplied by
    * default.  This method is equivalent to returning the first element in
    * the InetAddress array returned from GetAllByName.
    *
@@ -682,7 +681,7 @@
     if (hostname == null || hostname == "")
       return getByName(LOCALHOST_NAME);
 
-    // Assume that the host string is an IP address.
+    // Assume that the host string is an IP address
     byte[] address = aton (hostname);
     if (address != null)
       return new InetAddress (address);
@@ -878,7 +877,7 @@
   private static native byte[] lookupInaddrAny() throws UnknownHostException;
 
   /*
-   * Needed for serialization.
+   * Needed for serialization
    */
   private void readResolve() throws ObjectStreamException
   {