Index: working_classlib/modules/luni/src/main/java/java/io/ObjectInputStream.java =================================================================== --- working_classlib/modules/luni/src/main/java/java/io/ObjectInputStream.java (revision 612717) +++ working_classlib/modules/luni/src/main/java/java/io/ObjectInputStream.java (working copy) @@ -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,7 @@ // 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 +2358,7 @@ * Reset the collection of objects already loaded by the receiver. */ private void resetSeenObjects() { - objectsRead = new Hashtable(); + objectsRead = new HashMap(); currentHandle = baseWireHandle; primitiveData = emptyStream; }