From commits-return-60309-apmail-harmony-commits-archive=harmony.apache.org@harmony.apache.org Thu Oct 01 12:00:19 2009
Return-Path: <commits-return-60309-apmail-harmony-commits-archive=harmony.apache.org@harmony.apache.org>
Delivered-To: apmail-harmony-commits-archive@www.apache.org
Received: (qmail 32891 invoked from network); 1 Oct 2009 12:00:19 -0000
Received: from hermes.apache.org (HELO mail.apache.org) (140.211.11.3)
  by minotaur.apache.org with SMTP; 1 Oct 2009 12:00:19 -0000
Received: (qmail 25878 invoked by uid 500); 1 Oct 2009 12:00:19 -0000
Delivered-To: apmail-harmony-commits-archive@harmony.apache.org
Received: (qmail 25856 invoked by uid 500); 1 Oct 2009 12:00:19 -0000
Mailing-List: contact commits-help@harmony.apache.org; run by ezmlm
Precedence: bulk
List-Help: <mailto:commits-help@harmony.apache.org>
List-Unsubscribe: <mailto:commits-unsubscribe@harmony.apache.org>
List-Post: <mailto:commits@harmony.apache.org>
List-Id: <commits.harmony.apache.org>
Reply-To: dev@harmony.apache.org
Delivered-To: mailing list commits@harmony.apache.org
Received: (qmail 25847 invoked by uid 99); 1 Oct 2009 12:00:19 -0000
Received: from nike.apache.org (HELO nike.apache.org) (192.87.106.230)
    by apache.org (qpsmtpd/0.29) with ESMTP; Thu, 01 Oct 2009 12:00:19 +0000
X-ASF-Spam-Status: No, hits=-2000.0 required=10.0
	tests=ALL_TRUSTED
X-Spam-Check-By: apache.org
Received: from [140.211.11.4] (HELO eris.apache.org) (140.211.11.4)
    by apache.org (qpsmtpd/0.29) with ESMTP; Thu, 01 Oct 2009 12:00:16 +0000
Received: by eris.apache.org (Postfix, from userid 65534)
	id AA498238898D; Thu,  1 Oct 2009 11:59:25 +0000 (UTC)
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: 7bit
Subject: svn commit: r820621 - in /harmony/enhanced/classlib/trunk/modules/luni:
 make/findbugs-exclude-filter.xml src/main/java/java/net/InetAddress.java
Date: Thu, 01 Oct 2009 11:59:25 -0000
To: commits@harmony.apache.org
From: tellison@apache.org
X-Mailer: svnmailer-1.0.8
Message-Id: <20091001115925.AA498238898D@eris.apache.org>
X-Virus-Checked: Checked by ClamAV on apache.org

Author: tellison
Date: Thu Oct  1 11:59:25 2009
New Revision: 820621

URL: http://svn.apache.org/viewvc?rev=820621&view=rev
Log:
Explain why InetAddress#readResolve() is private.

Modified:
    harmony/enhanced/classlib/trunk/modules/luni/make/findbugs-exclude-filter.xml
    harmony/enhanced/classlib/trunk/modules/luni/src/main/java/java/net/InetAddress.java

Modified: harmony/enhanced/classlib/trunk/modules/luni/make/findbugs-exclude-filter.xml
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/trunk/modules/luni/make/findbugs-exclude-filter.xml?rev=820621&r1=820620&r2=820621&view=diff
==============================================================================
--- harmony/enhanced/classlib/trunk/modules/luni/make/findbugs-exclude-filter.xml (original)
+++ harmony/enhanced/classlib/trunk/modules/luni/make/findbugs-exclude-filter.xml Thu Oct  1 11:59:25 2009
@@ -18,6 +18,11 @@
 
 <!-- Exclusion filter for running FindBugs against Apache Harmony -->
 
+    <!--
+      Format and code information is available here
+      http://findbugs.sourceforge.net/manual/filter.html
+    -->
+
 <FindBugsFilter>
      
        <!-- Number classes should be able to call Number constructors -->
@@ -102,6 +107,13 @@
        <Bug code="EI2, EI" />
      </Match>
      
+     <!-- Spec requires that InetAddress readResolve is private -->
+     <Match>
+       <Class name="java.net.InetAddress" />
+       <Method name="readResolve" />
+       <Bug code="Se" />
+     </Match>
+     
      <!-- Method is not static in the spec, so can't change it -->
      <Match>
        <Class name="java.net.URLConnection" />

Modified: harmony/enhanced/classlib/trunk/modules/luni/src/main/java/java/net/InetAddress.java
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/trunk/modules/luni/src/main/java/java/net/InetAddress.java?rev=820621&r1=820620&r2=820621&view=diff
==============================================================================
--- harmony/enhanced/classlib/trunk/modules/luni/src/main/java/java/net/InetAddress.java (original)
+++ harmony/enhanced/classlib/trunk/modules/luni/src/main/java/java/net/InetAddress.java Thu Oct  1 11:59:25 2009
@@ -1368,6 +1368,10 @@
         family = fields.get("family", 2); //$NON-NLS-1$
     }
 
+    /*
+     * The spec requires that if we encounter a generic InetAddress in
+     * serialized form then we should interpret it as an Inet4 address.
+     */
     private Object readResolve() throws ObjectStreamException {
         return new Inet4Address(ipaddress, hostName);
     }