Return-Path: Delivered-To: apmail-harmony-commits-archive@www.apache.org Received: (qmail 59029 invoked from network); 27 Mar 2008 15:03:09 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (140.211.11.2) by minotaur.apache.org with SMTP; 27 Mar 2008 15:03:09 -0000 Received: (qmail 71965 invoked by uid 500); 27 Mar 2008 15:03:04 -0000 Delivered-To: apmail-harmony-commits-archive@harmony.apache.org Received: (qmail 71950 invoked by uid 500); 27 Mar 2008 15:03:04 -0000 Mailing-List: contact commits-help@harmony.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@harmony.apache.org Delivered-To: mailing list commits@harmony.apache.org Received: (qmail 71938 invoked by uid 99); 27 Mar 2008 15:03:04 -0000 Received: from nike.apache.org (HELO nike.apache.org) (192.87.106.230) by apache.org (qpsmtpd/0.29) with ESMTP; Thu, 27 Mar 2008 08:03:04 -0700 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.3] (HELO eris.apache.org) (140.211.11.3) by apache.org (qpsmtpd/0.29) with ESMTP; Thu, 27 Mar 2008 15:02:22 +0000 Received: by eris.apache.org (Postfix, from userid 65534) id 48DA31A9832; Thu, 27 Mar 2008 08:02:42 -0700 (PDT) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r641841 - /harmony/enhanced/classlib/trunk/modules/luni/src/main/java/java/io/ObjectInputStream.java Date: Thu, 27 Mar 2008 15:02:41 -0000 To: commits@harmony.apache.org From: tellison@apache.org X-Mailer: svnmailer-1.0.8 Message-Id: <20080327150242.48DA31A9832@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org Author: tellison Date: Thu Mar 27 08:02:39 2008 New Revision: 641841 URL: http://svn.apache.org/viewvc?rev=641841&view=rev Log: Apply patch HARMONY-5634 ([classlib][luni][performance] ObjectInputStream should use HashMap instead of Hashtable for internal storage) Modified: harmony/enhanced/classlib/trunk/modules/luni/src/main/java/java/io/ObjectInputStream.java Modified: harmony/enhanced/classlib/trunk/modules/luni/src/main/java/java/io/ObjectInputStream.java URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/trunk/modules/luni/src/main/java/java/io/ObjectInputStream.java?rev=641841&r1=641840&r2=641841&view=diff ============================================================================== --- harmony/enhanced/classlib/trunk/modules/luni/src/main/java/java/io/ObjectInputStream.java (original) +++ harmony/enhanced/classlib/trunk/modules/luni/src/main/java/java/io/ObjectInputStream.java Thu Mar 27 08:02:39 2008 @@ -27,7 +27,7 @@ import java.security.AccessController; import java.security.PrivilegedAction; import java.util.ArrayList; -import java.util.Hashtable; +import java.util.HashMap; import java.util.Iterator; import org.apache.harmony.kernel.vm.VM; @@ -81,7 +81,7 @@ private boolean enableResolve; // Table mapping Integer (handle) -> Object - private Hashtable objectsRead; + private HashMap objectsRead; // Used by defaultReadObject private Object currentObject; @@ -105,7 +105,8 @@ // Handle for the current class descriptor private Integer descriptorHandle; - private static final Hashtable> PRIMITIVE_CLASSES = new Hashtable>(); + private static final HashMap> PRIMITIVE_CLASSES = + new HashMap>(); static { PRIMITIVE_CLASSES.put("byte", byte.class); //$NON-NLS-1$ @@ -2358,7 +2359,7 @@ * Reset the collection of objects already loaded by the receiver. */ private void resetSeenObjects() { - objectsRead = new Hashtable(); + objectsRead = new HashMap(); currentHandle = baseWireHandle; primitiveData = emptyStream; }